From bf442e9deb6da8fdf141a31f967751ee9137e26d Mon Sep 17 00:00:00 2001 From: Ben Boeckel Date: Fri, 22 May 2026 13:47:42 -0400 Subject: [PATCH] Tests/CXXModulesCompile: fix `exp-builddb` name references in check scripts --- .../CXXModulesCompile/exp-builddb-check.cmake | 18 ++++++++--------- .../CXX-check.cmake | 20 +++++++++---------- .../CXX/Debug-check.cmake | 16 +++++++-------- .../CXX/Release-Release-check.cmake | 16 +++++++-------- .../Debug-check.cmake | 16 +++++++-------- .../Release-Release-check.cmake | 16 +++++++-------- 6 files changed, 51 insertions(+), 51 deletions(-) diff --git a/Tests/RunCMake/CXXModulesCompile/exp-builddb-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-check.cmake index efa43d285c..bff3a51b13 100644 --- a/Tests/RunCMake/CXXModulesCompile/exp-builddb-check.cmake +++ b/Tests/RunCMake/CXXModulesCompile/exp-builddb-check.cmake @@ -1,19 +1,19 @@ include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake") -check_build_database("export-build-database" "build_database.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX.json" NO_EXIST) +check_build_database("exp-builddb" "build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX_Debug.json" NO_EXIST) -check_build_database("export-build-database" "build_database_Debug.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX_Debug.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_Debug.json" NO_EXIST) if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" NO_EXIST) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" NO_EXIST) - check_build_database("export-build-database" "build_database_CXX_Release.json" NO_EXIST) - check_build_database("export-build-database" "build_database_Release.json" NO_EXIST) - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" NO_EXIST) + check_build_database("exp-builddb" "build_database_CXX_Release.json" NO_EXIST) + check_build_database("exp-builddb" "build_database_Release.json" NO_EXIST) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" NO_EXIST) else () - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/CXX_build_database.json" NO_EXIST) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/CXX_build_database.json" NO_EXIST) endif () string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX-check.cmake index cf712bab10..a0069ed0aa 100644 --- a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX-check.cmake +++ b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX-check.cmake @@ -1,21 +1,21 @@ include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") -check_build_database("export-build-database" "build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database.json" NO_EXIST) if (RunCMake_GENERATOR_IS_MULTI_CONFIG) - check_build_database("export-build-database" "build_database_CXX.json" JUST_CXX_MULTI) + check_build_database("exp-builddb" "build_database_CXX.json" JUST_CXX_MULTI) - check_build_database("export-build-database" "build_database_CXX_Debug.json" CXX_AND_DEBUG) - check_build_database("export-build-database" "build_database_Debug.json" JUST_DEBUG) - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) + check_build_database("exp-builddb" "build_database_CXX_Debug.json" CXX_AND_DEBUG) + check_build_database("exp-builddb" "build_database_Debug.json" JUST_DEBUG) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) - check_build_database("export-build-database" "build_database_CXX_Release.json" CXX_AND_RELEASE) - check_build_database("export-build-database" "build_database_Release.json" JUST_RELEASE) - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) + check_build_database("exp-builddb" "build_database_CXX_Release.json" CXX_AND_RELEASE) + check_build_database("exp-builddb" "build_database_Release.json" JUST_RELEASE) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) else () - check_build_database("export-build-database" "build_database_CXX.json" JUST_CXX) + check_build_database("exp-builddb" "build_database_CXX.json" JUST_CXX) - check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/CXX_build_database.json" JUST_TARGET) + check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/CXX_build_database.json" JUST_TARGET) endif () string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake index 6f60675dd5..0e7316a434 100644 --- a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake +++ b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake @@ -1,14 +1,14 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake") -check_build_database("export-build-database" "build_database.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX.json" NO_EXIST) +check_build_database("exp-builddb" "build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX_Debug.json" CXX_AND_DEBUG) -check_build_database("export-build-database" "build_database_Debug.json" NO_EXIST) -check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) +check_build_database("exp-builddb" "build_database_CXX_Debug.json" CXX_AND_DEBUG) +check_build_database("exp-builddb" "build_database_Debug.json" NO_EXIST) +check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) -check_build_database("export-build-database" "build_database_CXX_Release.json" NO_EXIST) -check_build_database("export-build-database" "build_database_Release.json" NO_EXIST) -check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX_Release.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_Release.json" NO_EXIST) +check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" NO_EXIST) string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake index dcb36c93eb..49b01a5c16 100644 --- a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake +++ b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake @@ -1,14 +1,14 @@ include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake") -check_build_database("export-build-database" "build_database.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX.json" NO_EXIST) +check_build_database("exp-builddb" "build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX_Debug.json" CXX_AND_DEBUG) -check_build_database("export-build-database" "build_database_Debug.json" JUST_DEBUG) -check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) +check_build_database("exp-builddb" "build_database_CXX_Debug.json" CXX_AND_DEBUG) +check_build_database("exp-builddb" "build_database_Debug.json" JUST_DEBUG) +check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) -check_build_database("export-build-database" "build_database_CXX_Release.json" CXX_AND_RELEASE) -check_build_database("export-build-database" "build_database_Release.json" NO_EXIST) -check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) +check_build_database("exp-builddb" "build_database_CXX_Release.json" CXX_AND_RELEASE) +check_build_database("exp-builddb" "build_database_Release.json" NO_EXIST) +check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Debug-check.cmake index 6868302600..a3ff2b0933 100644 --- a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Debug-check.cmake +++ b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Debug-check.cmake @@ -1,14 +1,14 @@ include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") -check_build_database("export-build-database" "build_database.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX.json" NO_EXIST) +check_build_database("exp-builddb" "build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX_Debug.json" CXX_AND_DEBUG) -check_build_database("export-build-database" "build_database_Debug.json" JUST_DEBUG) -check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) +check_build_database("exp-builddb" "build_database_CXX_Debug.json" CXX_AND_DEBUG) +check_build_database("exp-builddb" "build_database_Debug.json" JUST_DEBUG) +check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) -check_build_database("export-build-database" "build_database_CXX_Release.json" NO_EXIST) -check_build_database("export-build-database" "build_database_Release.json" NO_EXIST) -check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX_Release.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_Release.json" NO_EXIST) +check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" NO_EXIST) string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}") diff --git a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Release-Release-check.cmake index 31da4be87b..325467c463 100644 --- a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Release-Release-check.cmake +++ b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Release-Release-check.cmake @@ -1,14 +1,14 @@ include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake") -check_build_database("export-build-database" "build_database.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX.json" NO_EXIST) +check_build_database("exp-builddb" "build_database.json" NO_EXIST) +check_build_database("exp-builddb" "build_database_CXX.json" NO_EXIST) -check_build_database("export-build-database" "build_database_CXX_Debug.json" CXX_AND_DEBUG) -check_build_database("export-build-database" "build_database_Debug.json" JUST_DEBUG) -check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) +check_build_database("exp-builddb" "build_database_CXX_Debug.json" CXX_AND_DEBUG) +check_build_database("exp-builddb" "build_database_Debug.json" JUST_DEBUG) +check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG) -check_build_database("export-build-database" "build_database_CXX_Release.json" CXX_AND_RELEASE) -check_build_database("export-build-database" "build_database_Release.json" JUST_RELEASE) -check_build_database("export-build-database" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) +check_build_database("exp-builddb" "build_database_CXX_Release.json" CXX_AND_RELEASE) +check_build_database("exp-builddb" "build_database_Release.json" JUST_RELEASE) +check_build_database("exp-builddb" "CMakeFiles/export_build_database.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE) string(REPLACE ";" "\n " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")