diff --git a/.gitlab/ci/ctest_exclusions.cmake b/.gitlab/ci/ctest_exclusions.cmake
index 22df0ddbb6..34aa164f63 100644
--- a/.gitlab/ci/ctest_exclusions.cmake
+++ b/.gitlab/ci/ctest_exclusions.cmake
@@ -34,6 +34,7 @@ if ("$ENV{CMAKE_CONFIGURATION}" MATCHES "_valgrind")
     "^RunCMake.Autogen_Qt6_1$"
     "^RunCMake.GoogleTest$"
     "^RunCMake.CXXModules$"
+    "^RunCMake.CXXModulesCompile$"
     "^RunCMake.CommandLine$"
 
     # Too spurious under Valgrind.
diff --git a/Tests/RunCMake/CMakeLists.txt b/Tests/RunCMake/CMakeLists.txt
index f031c43e17..54fae580d5 100644
--- a/Tests/RunCMake/CMakeLists.txt
+++ b/Tests/RunCMake/CMakeLists.txt
@@ -833,11 +833,14 @@ set_property(TEST RunCMake.DependencyGraph APPEND PROPERTY LABELS "Fortran")
 
 # Add C++ Module tests.
 add_RunCMake_test(CXXModules
+  -DCMake_TEST_CXX_STDLIB_MODULES_JSON=${CMake_TEST_CXX_STDLIB_MODULES_JSON}
+)
+add_RunCMake_test(CXXModulesCompile
   -DCMake_TEST_MODULE_COMPILATION=${CMake_TEST_MODULE_COMPILATION}
   -DCMake_TEST_MODULE_COMPILATION_RULES=${CMake_TEST_MODULE_COMPILATION_RULES}
   -DCMake_TEST_CXX_STDLIB_MODULES_JSON=${CMake_TEST_CXX_STDLIB_MODULES_JSON}
 )
-set_property(TEST RunCMake.CXXModules APPEND
+set_property(TEST RunCMake.CXXModules RunCMake.CXXModulesCompile APPEND
   PROPERTY LABELS "CXXModules")
 
 # ctresalloc links against CMakeLib and CTestLib, which means it can't be built
diff --git a/Tests/RunCMake/CXXModules/InstallBMINoGenericArgs-check.cmake b/Tests/RunCMake/CXXModules/InstallBMINoGenericArgs-check.cmake
deleted file mode 100644
index 412e260d2e..0000000000
--- a/Tests/RunCMake/CXXModules/InstallBMINoGenericArgs-check.cmake
+++ /dev/null
@@ -1,8 +0,0 @@
-file(READ "${RunCMake_TEST_BINARY_DIR}/cmake_install.cmake" install_script)
-
-if (install_script MATCHES [[include\("[^)]*/CMakeFiles/install-bmi-generic-args\.dir/install-cxx-module-bmi-[^.]*\.cmake" OPTIONAL\)]])
-  list(APPEND RunCMake_TEST_FAILED
-    "Found BMI install script inclusion")
-endif ()
-
-string(REPLACE ";" "; " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
index 9a8e6987b5..31c5e3e144 100644
--- a/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
+++ b/Tests/RunCMake/CXXModules/RunCMakeTest.cmake
@@ -135,330 +135,3 @@ else ()
   message(FATAL_ERROR
     "Please add 'DependInfo' tests for the '${RunCMake_GENERATOR}' generator.")
 endif ()
-
-# Actual compilation tests.
-if (NOT CMake_TEST_MODULE_COMPILATION)
-  return ()
-endif ()
-
-function (run_cxx_module_test directory)
-  set(test_name "${directory}")
-  if (NOT ARGN STREQUAL "")
-    list(POP_FRONT ARGN test_name)
-  endif ()
-
-  set(RunCMake_TEST_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/examples/${directory}")
-  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/examples/${test_name}-build")
-
-  if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-    set(RunCMake_TEST_OPTIONS -DCMAKE_CONFIGURATION_TYPES=Debug)
-  else ()
-    set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
-  endif ()
-  if (directory MATCHES "import-std")
-    list(APPEND RunCMake_TEST_OPTIONS
-      ${stdlib_custom_json})
-  endif ()
-
-  if (RunCMake_CXXModules_INSTALL)
-    set(prefix "${RunCMake_BINARY_DIR}/examples/${test_name}-install")
-    file(REMOVE_RECURSE "${prefix}")
-    list(APPEND RunCMake_TEST_OPTIONS
-      "-DCMAKE_INSTALL_PREFIX=${prefix}")
-  endif ()
-
-  list(APPEND RunCMake_TEST_OPTIONS
-    "-DCMake_TEST_MODULE_COMPILATION_RULES=${CMake_TEST_MODULE_COMPILATION_RULES}"
-    ${ARGN})
-  run_cmake("examples/${test_name}")
-  set(RunCMake_TEST_NO_CLEAN 1)
-  if (RunCMake_CXXModules_TARGET)
-    run_cmake_command("examples/${test_name}-build" "${CMAKE_COMMAND}" --build . --config Debug --target "${RunCMake_CXXModules_TARGET}")
-  else ()
-    run_cmake_command("examples/${test_name}-build" "${CMAKE_COMMAND}" --build . --config Debug)
-    foreach (RunCMake_CXXModules_TARGET IN LISTS RunCMake_CXXModules_TARGETS)
-      set(RunCMake_CXXModules_CONFIG "Debug")
-      set(RunCMake_CXXModules_NAME_SUFFIX "")
-      if (RunCMake_CXXModules_TARGET MATCHES "(.*)@(.*)")
-        set(RunCMake_CXXModules_TARGET "${CMAKE_MATCH_1}")
-        set(RunCMake_CXXModules_CONFIG "${CMAKE_MATCH_2}")
-        set(RunCMake_CXXModules_NAME_SUFFIX "-${RunCMake_CXXModules_CONFIG}")
-      endif ()
-      run_cmake_command("examples/${test_name}-target-${RunCMake_CXXModules_TARGET}${RunCMake_CXXModules_NAME_SUFFIX}" "${CMAKE_COMMAND}" --build . --target "${RunCMake_CXXModules_TARGET}" --config "${RunCMake_CXXModules_CONFIG}")
-    endforeach ()
-  endif ()
-  if (RunCMake_CXXModules_INSTALL)
-    run_cmake_command("examples/${test_name}-install" "${CMAKE_COMMAND}" --build . --target install --config Debug)
-  endif ()
-  if (NOT RunCMake_CXXModules_NO_TEST)
-    run_cmake_command("examples/${test_name}-test" "${CMAKE_CTEST_COMMAND}" -C Debug --output-on-failure)
-  endif ()
-  if (RunCMake_CXXModules_REBUILD)
-    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
-    include("${RunCMake_TEST_SOURCE_DIR}/pre-rebuild.cmake")
-    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
-    run_cmake_command("examples/${test_name}-rebuild" "${CMAKE_COMMAND}" --build . --config Debug)
-  endif ()
-endfunction ()
-
-function (run_cxx_module_test_target directory target)
-  set(RunCMake_CXXModules_TARGET "${target}")
-  set(RunCMake_CXXModules_NO_TEST 1)
-  run_cxx_module_test("${directory}" ${ARGN})
-endfunction ()
-
-function (run_cxx_module_test_rebuild directory)
-  set(RunCMake_CXXModules_INSTALL 0)
-  set(RunCMake_CXXModules_NO_TEST 1)
-  set(RunCMake_CXXModules_REBUILD 1)
-  run_cxx_module_test("${directory}" ${ARGN})
-endfunction ()
-
-# Module compilation features:
-# Compiler-based:
-# - `named`: basic support for named modules is available
-# - `shared`: shared libraries are supported
-# - `partitions`: module partitions are supported
-# - `internal_partitions`: internal module partitions are supported
-# - `bmionly`: the compiler supports BMI-only builds
-# - `import_std23`: the compiler supports `import std` for C++23
-#
-# Generator-based:
-# - `compile_commands`: the generator supports `compile_commands.json`
-# - `collation`: the generator supports module collation features
-# - `export_bmi`: the generator supports exporting BMIs
-# - `ninja`: a `ninja` binary is available to perform `Ninja`-only testing
-#   (assumed if the generator matches `Ninja`).
-string(REPLACE "," ";" CMake_TEST_MODULE_COMPILATION "${CMake_TEST_MODULE_COMPILATION}")
-if (RunCMake_GENERATOR MATCHES "Ninja")
-  list(APPEND CMake_TEST_MODULE_COMPILATION
-    "ninja")
-endif ()
-
-if (RunCMake_GENERATOR MATCHES "Ninja")
-  if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-    set(ninja_cmp0154_target "CMakeFiles/ninja_cmp0154.dir/Debug/unrelated.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
-  else ()
-    set(ninja_cmp0154_target "CMakeFiles/ninja_cmp0154.dir/unrelated.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
-  endif ()
-  run_cxx_module_test_target(ninja-cmp0154 "${ninja_cmp0154_target}")
-endif ()
-
-run_cxx_module_test(scan-with-pch)
-
-# Tests which use named modules.
-if ("named" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  run_cxx_module_test(simple)
-  run_cxx_module_test(file-sets-with-dot)
-  run_cxx_module_test(vs-without-flags)
-  run_cxx_module_test(library library-static -DBUILD_SHARED_LIBS=OFF)
-  run_cxx_module_test(unity-build)
-  run_cxx_module_test(object-library)
-  run_cxx_module_test(generated)
-  run_cxx_module_test(deep-chain)
-  run_cxx_module_test(non-trivial-collation-order)
-  run_cxx_module_test(non-trivial-collation-order-randomized)
-  run_cxx_module_test(duplicate)
-  set(RunCMake_CXXModules_NO_TEST 1)
-  run_cxx_module_test(import-from-object)
-  run_cxx_module_test(circular)
-  run_cxx_module_test(try-compile)
-  run_cxx_module_test(try-run)
-  unset(RunCMake_CXXModules_NO_TEST)
-  run_cxx_module_test(same-src-name)
-  run_cxx_module_test(scan_properties)
-  run_cxx_module_test(target-objects)
-
-  if ("cxx_std_23" IN_LIST CMAKE_CXX_COMPILE_FEATURES AND
-      "import_std23" IN_LIST CMake_TEST_MODULE_COMPILATION)
-    run_cxx_module_test(import-std)
-    set(RunCMake_CXXModules_NO_TEST 1)
-    run_cxx_module_test(import-std-no-std-property)
-    unset(RunCMake_CXXModules_NO_TEST)
-    run_cxx_module_test(import-std-export-no-std-build)
-    set(RunCMake_CXXModules_INSTALL 1)
-    run_cxx_module_test(import-std-export-no-std-install)
-    unset(RunCMake_CXXModules_INSTALL)
-
-    if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION)
-      run_cxx_module_test(import-std-not-in-export-build)
-      run_cxx_module_test(import-std-transitive import-std-transitive-not-in-export-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/import-std-not-in-export-build-build")
-
-      set(RunCMake_CXXModules_INSTALL 1)
-      run_cxx_module_test(import-std-not-in-export-install)
-      unset(RunCMake_CXXModules_INSTALL)
-      run_cxx_module_test(import-std-transitive import-std-transitive-not-in-export-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/import-std-not-in-export-install-install")
-
-      run_cxx_module_test(import-std-transitive import-std-transitive-export-no-std-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/import-std-export-no-std-build-build" -DEXPORT_NO_STD=1)
-      run_cxx_module_test(import-std-transitive import-std-transitive-export-no-std-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/import-std-export-no-std-install-install" -DEXPORT_NO_STD=1)
-    endif ()
-  endif ()
-endif ()
-
-# Tests which require compile commands support.
-if ("compile_commands" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  run_cxx_module_test(export-compile-commands)
-endif ()
-
-macro (setup_export_build_database_targets)
-  set(RunCMake_CXXModules_TARGETS
-    cmake_build_database-CXX
-    cmake_build_database)
-
-  if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-    list(INSERT RunCMake_CXXModules_TARGETS 0
-      cmake_build_database-CXX-Debug
-      cmake_build_database-Debug
-      # Other config targets.
-      cmake_build_database-CXX-Release@Release
-      cmake_build_database-Release@Release)
-  endif ()
-endmacro ()
-
-# Tests which require build database support.
-if ("build_database" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  setup_export_build_database_targets()
-  set(RunCMake_CXXModules_NO_TEST 1)
-
-  run_cxx_module_test(export-build-database)
-
-  unset(RunCMake_CXXModules_NO_TEST)
-  unset(RunCMake_CXXModules_TARGETS)
-endif ()
-
-# Tests which require collation work.
-if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  run_cxx_module_test(duplicate-sources)
-  run_cxx_module_test(public-req-private)
-  set(RunCMake_CXXModules_NO_TEST 1)
-  run_cxx_module_test(req-private-other-target)
-  unset(RunCMake_CXXModules_NO_TEST)
-  run_cxx_module_test_rebuild(depchain-modmap)
-  run_cxx_module_test_rebuild(depchain-modules-json-file)
-  if (RunCMake_GENERATOR MATCHES "Ninja")
-    run_cxx_module_test_rebuild(depchain-collation-restat)
-  endif ()
-endif ()
-
-# Tests which use named modules in shared libraries.
-if ("shared" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  run_cxx_module_test(library library-shared -DBUILD_SHARED_LIBS=ON)
-endif ()
-
-# Tests which use partitions.
-if ("partitions" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  run_cxx_module_test(partitions)
-endif ()
-
-# Tests which use internal partitions.
-if ("internal_partitions" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  run_cxx_module_test(internal-partitions)
-endif ()
-
-function (run_cxx_module_import_test type name)
-  set(RunCMake_CXXModules_INSTALL 0)
-
-  if ("EXPORT_BUILD_DATABASE" IN_LIST ARGN)
-    list(REMOVE_ITEM ARGN EXPORT_BUILD_DATABASE)
-    list(APPEND ARGN -DCMAKE_EXPORT_BUILD_DATABASE=1)
-  endif ()
-
-  run_cxx_module_test(import-modules "import-modules-${name}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/${name}-${type}" ${ARGN})
-endfunction ()
-
-# Tests which install BMIs
-if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  run_cxx_module_test(export-interface-no-properties-build)
-  run_cxx_module_test(export-interface-build)
-  run_cxx_module_test(export-include-directories-build)
-  run_cxx_module_test(export-include-directories-old-cmake-build)
-  run_cxx_module_test(export-usage-build)
-  run_cxx_module_test(export-bmi-and-interface-build)
-  run_cxx_module_test(export-command-sepdir-build)
-  run_cxx_module_test(export-transitive-targets-build)
-  run_cxx_module_test(export-transitive-modules1-build)
-  run_cxx_module_test(export-transitive-modules-build export-transitive-modules-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/export-transitive-modules1-build-build" )
-  run_cxx_module_test(export-with-headers-build)
-
-  if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND
-      "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
-    run_cxx_module_import_test(build export-interface-build)
-    run_cxx_module_import_test(build export-interface-no-properties-build -DNO_PROPERTIES=1)
-    run_cxx_module_import_test(build export-include-directories-build -DINCLUDE_PROPERTIES=1)
-    run_cxx_module_import_test(build export-bmi-and-interface-build -DWITH_BMIS=1)
-    run_cxx_module_import_test(build export-command-sepdir-build -DEXPORT_COMMAND_SEPDIR=1)
-    run_cxx_module_import_test(build export-transitive-targets-build -DTRANSITIVE_TARGETS=1)
-    run_cxx_module_import_test(build export-transitive-modules-build -DTRANSITIVE_MODULES=1)
-    run_cxx_module_import_test(build export-with-headers-build -DWITH_HEADERS=1)
-
-    if ("build_database" IN_LIST CMake_TEST_MODULE_COMPILATION)
-      setup_export_build_database_targets()
-
-      run_cxx_module_import_test(build export-build-database -DBUILD_DATABASE=1 EXPORT_BUILD_DATABASE)
-
-      unset(RunCMake_CXXModules_TARGETS)
-    endif ()
-  endif ()
-endif ()
-
-# All of the following tests perform installation.
-set(RunCMake_CXXModules_INSTALL 1)
-
-# Tests which install BMIs
-if ("install_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  run_cxx_module_test(install-bmi)
-  run_cxx_module_test(install-bmi-and-interfaces)
-
-  if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
-    run_cxx_module_test(export-interface-no-properties-install)
-    run_cxx_module_test(export-interface-install)
-    run_cxx_module_test(export-include-directories-install)
-    run_cxx_module_test(export-include-directories-old-cmake-install)
-    run_cxx_module_test(export-usage-install)
-    run_cxx_module_test(export-bmi-and-interface-install)
-    run_cxx_module_test(export-command-sepdir-install)
-    run_cxx_module_test(export-transitive-targets-install)
-    run_cxx_module_test(export-transitive-modules1-install)
-    run_cxx_module_test(export-transitive-modules-install export-transitive-modules-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/export-transitive-modules1-install-install" )
-    run_cxx_module_test(export-with-headers-install)
-
-    if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND
-        "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
-      run_cxx_module_import_test(install export-interface-install)
-      run_cxx_module_import_test(install export-interface-no-properties-install -DNO_PROPERTIES=1)
-      run_cxx_module_import_test(install export-include-directories-install -DINCLUDE_PROPERTIES=1)
-      run_cxx_module_import_test(install export-bmi-and-interface-install -DWITH_BMIS=1)
-      run_cxx_module_import_test(install export-command-sepdir-install -DEXPORT_COMMAND_SEPDIR=1)
-      run_cxx_module_import_test(install export-transitive-targets-install -DTRANSITIVE_TARGETS=1)
-      run_cxx_module_import_test(install export-transitive-modules-install -DTRANSITIVE_MODULES=1)
-      run_cxx_module_import_test(install export-with-headers-install -DWITH_HEADERS=1)
-    endif ()
-  endif ()
-endif ()
-
-# All remaining tests require a working `Ninja` generator to set up a test case
-# for the current generator.
-if (NOT "ninja" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  return ()
-endif ()
-# All remaining tests require `bmionly` in order to consume from the `ninja`
-# build.
-if (NOT "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
-  return ()
-endif ()
-
-function (run_cxx_module_test_ninja directory)
-  set(RunCMake_GENERATOR "Ninja")
-  set(RunCMake_CXXModules_NO_TEST 1)
-  set(RunCMake_CXXModules_INSTALL 1)
-  # `Ninja` is not a multi-config generator.
-  set(RunCMake_GENERATOR_IS_MULTI_CONFIG 0)
-  run_cxx_module_test("${directory}" "${directory}-ninja" ${ARGN})
-endfunction ()
-
-# Installation happens within `run_cxx_module_test_ninja`.
-set(RunCMake_CXXModules_INSTALL 0)
-
-set(test_set modules-from-ninja)
-run_cxx_module_test_ninja("export-${test_set}")
-run_cxx_module_test(import-modules "import-${test_set}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/export-${test_set}-ninja-install" -DFROM_NINJA=1)
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database-build-check.cmake b/Tests/RunCMake/CXXModules/examples/export-build-database-build-check.cmake
deleted file mode 100644
index 131926bafc..0000000000
--- a/Tests/RunCMake/CXXModules/examples/export-build-database-build-check.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-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("export-build-database" "build_database_CXX_Debug.json" NO_EXIST)
-check_build_database("export-build-database" "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" 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)
-else ()
-  check_build_database("export-build-database" "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/CXXModules/examples/export-build-database-target-cmake_build_database-check.cmake b/Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database-check.cmake
deleted file mode 100644
index 79db482678..0000000000
--- a/Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database-check.cmake
+++ /dev/null
@@ -1,21 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
-
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database" "build_database.json" ALL_MULTI)
-  check_build_database("export-build-database" "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("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)
-else ()
-  check_build_database("export-build-database" "build_database.json" ALL)
-  check_build_database("export-build-database" "build_database_CXX.json" JUST_CXX)
-
-  check_build_database("export-build-database" "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/CXXModules/examples/import-modules-export-build-database-build-check.cmake b/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-build-check.cmake
deleted file mode 100644
index 21a29b6ac5..0000000000
--- a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-build-check.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
-set(item_filter "-ifcOnly")
-
-check_build_database("export-build-database-imported" "build_database.json" NO_EXIST)
-check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST)
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "build_database_Debug.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/Debug/CXX_build_database.json" NO_EXIST)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/Release/CXX_build_database.json" NO_EXIST)
-else ()
-  check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/CXX_build_database.json" NO_EXIST)
-endif ()
-
-string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-check.cmake b/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-check.cmake
deleted file mode 100644
index 21a29b6ac5..0000000000
--- a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-check.cmake
+++ /dev/null
@@ -1,18 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
-set(item_filter "-ifcOnly")
-
-check_build_database("export-build-database-imported" "build_database.json" NO_EXIST)
-check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST)
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "build_database_Debug.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/Debug/CXX_build_database.json" NO_EXIST)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/Release/CXX_build_database.json" NO_EXIST)
-else ()
-  check_build_database("export-build-database-imported" "CMakeFiles/export-module-commands.dir/CXX_build_database.json" NO_EXIST)
-endif ()
-
-string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database-check.cmake b/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database-check.cmake
deleted file mode 100644
index cfa3a3c066..0000000000
--- a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database-check.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
-set(item_filter "-ifcOnly")
-
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database-imported" "build_database.json" ALL_MULTI)
-  check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX_MULTI)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
-  check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Release.json" CXX_AND_RELEASE)
-  check_build_database("export-build-database-imported" "build_database_Release.json" JUST_RELEASE)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE)
-else ()
-  check_build_database("export-build-database-imported" "build_database.json" ALL)
-  check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX)
-
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
-endif ()
-
-string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX-check.cmake b/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX-check.cmake
deleted file mode 100644
index 39203d90d0..0000000000
--- a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX-check.cmake
+++ /dev/null
@@ -1,22 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake")
-set(item_filter "-ifcOnly")
-
-check_build_database("export-build-database-imported" "build_database.json" NO_EXIST)
-
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX_MULTI)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
-  check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Release.json" CXX_AND_RELEASE)
-  check_build_database("export-build-database-imported" "build_database_Release.json" JUST_RELEASE)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE)
-else ()
-  check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX)
-
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
-endif ()
-
-string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Debug-check.cmake b/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Debug-check.cmake
deleted file mode 100644
index cf01237e96..0000000000
--- a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Debug-check.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake")
-set(item_filter "-ifcOnly")
-
-check_build_database("export-build-database-imported" "build_database.json" NO_EXIST)
-check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST)
-
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
-  check_build_database("export-build-database-imported" "build_database_Debug.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" NO_EXIST)
-else ()
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
-endif ()
-
-string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake b/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake
deleted file mode 100644
index 7e231eaf26..0000000000
--- a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake")
-set(item_filter "-ifcOnly")
-
-check_build_database("export-build-database-imported" "build_database.json" NO_EXIST)
-check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST)
-
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
-  check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Release.json" CXX_AND_RELEASE)
-  check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE)
-else ()
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
-endif ()
-
-string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/Debug-check.cmake b/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/Debug-check.cmake
deleted file mode 100644
index 876888c12c..0000000000
--- a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/Debug-check.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake")
-set(item_filter "-ifcOnly")
-
-check_build_database("export-build-database-imported" "build_database.json" NO_EXIST)
-check_build_database("export-build-database-imported" "build_database_CXX.json" NO_EXIST)
-
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
-  check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "build_database_Release.json" NO_EXIST)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" NO_EXIST)
-else ()
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
-endif ()
-
-string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/Release-check.cmake b/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/Release-check.cmake
deleted file mode 100644
index 94edc3b2c8..0000000000
--- a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-target-cmake_build_database/Release-check.cmake
+++ /dev/null
@@ -1,19 +0,0 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake")
-set(item_filter "-ifcOnly")
-
-check_build_database("export-build-database-imported" "build_database.json" NO_EXIST)
-check_build_database("export-build-database-imported" "build_database_CXX.json" JUST_CXX)
-
-if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
-  check_build_database("export-build-database-imported" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
-  check_build_database("export-build-database-imported" "build_database_Debug.json" JUST_DEBUG)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
-
-  check_build_database("export-build-database-imported" "build_database_CXX_Release.json" CXX_AND_RELEASE)
-  check_build_database("export-build-database-imported" "build_database_Release.json" JUST_RELEASE)
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE)
-else ()
-  check_build_database("export-build-database-imported" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
-endif ()
-
-string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/public-req-private-build-stdout.txt b/Tests/RunCMake/CXXModules/examples/public-req-private-build-stdout.txt
deleted file mode 100644
index def33faa61..0000000000
--- a/Tests/RunCMake/CXXModules/examples/public-req-private-build-stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-CMake Error: Public C\+\+ module source `.*/Tests/RunCMake/CXXModules/examples/public-req-private/pub\.cxx` requires the `priv` C\+\+ module which is provided by a private source
diff --git a/Tests/RunCMake/CXXModulesCompile/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/CMakeLists.txt
new file mode 100644
index 0000000000..913371fc71
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/CMakeLists.txt
@@ -0,0 +1,4 @@
+cmake_minimum_required(VERSION 3.23)
+project(${RunCMake_TEST} NONE)
+
+include(${RunCMake_TEST}.cmake)
diff --git a/Tests/RunCMake/CXXModulesCompile/Inspect.cmake b/Tests/RunCMake/CXXModulesCompile/Inspect.cmake
new file mode 100644
index 0000000000..fb8b3e2a16
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/Inspect.cmake
@@ -0,0 +1,23 @@
+enable_language(CXX)
+
+set(info "")
+
+# See `Modules/Compiler/MSVC-CXX.cmake` for this. If there is explicitly no
+# default, the feature list is populated to be everything.
+if (DEFINED CMAKE_CXX_STANDARD_DEFAULT AND
+    CMAKE_CXX_STANDARD_DEFAULT STREQUAL "")
+  set(CMAKE_CXX_COMPILE_FEATURES "")
+endif ()
+
+# Forward information about the C++ compile features.
+string(APPEND info "\
+set(CMAKE_CXX_COMPILE_FEATURES \"${CMAKE_CXX_COMPILE_FEATURES}\")
+set(CMAKE_MAKE_PROGRAM \"${CMAKE_MAKE_PROGRAM}\")
+set(CMAKE_CXX_COMPILER_VERSION \"${CMAKE_CXX_COMPILER_VERSION}\")
+set(CMAKE_CXX_OUTPUT_EXTENSION \"${CMAKE_CXX_OUTPUT_EXTENSION}\")
+set(CMAKE_CXX20_STANDARD_COMPILE_OPTION \"${CMAKE_CXX20_STANDARD_COMPILE_OPTION}\")
+set(CMAKE_CXX_COMPILER_FRONTEND_VARIANT \"${CMAKE_CXX_COMPILER_FRONTEND_VARIANT}\")
+set(CMAKE_CXX_MODULE_MAP_FORMAT \"${CMAKE_CXX_MODULE_MAP_FORMAT}\")
+")
+
+file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/info.cmake" "${info}")
diff --git a/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake b/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake
new file mode 100644
index 0000000000..69beb79b5b
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake
@@ -0,0 +1,372 @@
+include(RunCMake)
+
+set(stdlib_custom_json)
+if (CMake_TEST_CXX_STDLIB_MODULES_JSON)
+  list(APPEND stdlib_custom_json
+    -DCMAKE_CXX_STDLIB_MODULES_JSON=${CMake_TEST_CXX_STDLIB_MODULES_JSON})
+endif ()
+
+run_cmake(Inspect ${stdlib_custom_json})
+include("${RunCMake_BINARY_DIR}/Inspect-build/info.cmake")
+
+if (RunCMake_GENERATOR MATCHES "Ninja")
+  execute_process(
+    COMMAND "${CMAKE_MAKE_PROGRAM}" --version
+    RESULT_VARIABLE res
+    OUTPUT_VARIABLE ninja_version
+    ERROR_VARIABLE err
+    OUTPUT_STRIP_TRAILING_WHITESPACE
+    ERROR_STRIP_TRAILING_WHITESPACE)
+
+  if (res)
+    message(WARNING
+      "Failed to determine `ninja` version: ${err}")
+    set(ninja_version "0")
+  endif ()
+endif ()
+
+set(generator_supports_cxx_modules 0)
+if (RunCMake_GENERATOR MATCHES "Ninja" AND
+    ninja_version VERSION_GREATER_EQUAL "1.11" AND
+    "cxx_std_20" IN_LIST CMAKE_CXX_COMPILE_FEATURES)
+  set(generator_supports_cxx_modules 1)
+endif ()
+
+if (RunCMake_GENERATOR MATCHES "Visual Studio" AND
+    CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "19.34")
+  set(generator_supports_cxx_modules 1)
+endif ()
+
+# Test behavior when the generator does not support C++20 modules.
+if (NOT generator_supports_cxx_modules)
+  # Bail; the remaining tests require the generator to successfully generate
+  # with C++20 modules in the source list.
+  return ()
+endif ()
+
+# This performs actual compilation tests; avoid it when not requested.
+if (NOT CMake_TEST_MODULE_COMPILATION)
+  return ()
+endif ()
+
+# Module compilation features:
+# Compiler-based:
+# - `named`: basic support for named modules is available
+# - `shared`: shared libraries are supported
+# - `partitions`: module partitions are supported
+# - `internal_partitions`: internal module partitions are supported
+# - `bmionly`: the compiler supports BMI-only builds
+# - `import_std23`: the compiler supports `import std` for C++23
+#
+# Generator-based:
+# - `compile_commands`: the generator supports `compile_commands.json`
+# - `collation`: the generator supports module collation features
+# - `export_bmi`: the generator supports exporting BMIs
+# - `ninja`: a `ninja` binary is available to perform `Ninja`-only testing
+#   (assumed if the generator matches `Ninja`).
+string(REPLACE "," ";" CMake_TEST_MODULE_COMPILATION "${CMake_TEST_MODULE_COMPILATION}")
+if (RunCMake_GENERATOR MATCHES "Ninja")
+  list(APPEND CMake_TEST_MODULE_COMPILATION
+    "ninja")
+endif ()
+
+function (run_cxx_module_test directory)
+  set(test_name "${directory}")
+  if (NOT ARGN STREQUAL "")
+    list(POP_FRONT ARGN test_name)
+  endif ()
+
+  set(RunCMake_TEST_SOURCE_DIR "${CMAKE_CURRENT_LIST_DIR}/${directory}")
+  set(RunCMake_TEST_BINARY_DIR "${RunCMake_BINARY_DIR}/${test_name}-build")
+
+  if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+    set(RunCMake_TEST_OPTIONS -DCMAKE_CONFIGURATION_TYPES=Debug)
+  else ()
+    set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
+  endif ()
+  if (directory MATCHES "imp-std")
+    list(APPEND RunCMake_TEST_OPTIONS
+      ${stdlib_custom_json})
+  endif ()
+
+  if (RunCMake_CXXModules_INSTALL)
+    set(prefix "${RunCMake_BINARY_DIR}/${test_name}-install")
+    file(REMOVE_RECURSE "${prefix}")
+    list(APPEND RunCMake_TEST_OPTIONS
+      "-DCMAKE_INSTALL_PREFIX=${prefix}")
+  endif ()
+
+  list(APPEND RunCMake_TEST_OPTIONS
+    "-DCMake_TEST_MODULE_COMPILATION_RULES=${CMake_TEST_MODULE_COMPILATION_RULES}"
+    ${ARGN})
+  run_cmake("${test_name}")
+  set(RunCMake_TEST_NO_CLEAN 1)
+  if (RunCMake_CXXModules_TARGET)
+    run_cmake_command("${test_name}-build" "${CMAKE_COMMAND}" --build . --config Debug --target "${RunCMake_CXXModules_TARGET}")
+  else ()
+    run_cmake_command("${test_name}-build" "${CMAKE_COMMAND}" --build . --config Debug)
+    foreach (RunCMake_CXXModules_TARGET IN LISTS RunCMake_CXXModules_TARGETS)
+      set(RunCMake_CXXModules_CONFIG "Debug")
+      set(RunCMake_CXXModules_NAME_SUFFIX "")
+      if (RunCMake_CXXModules_TARGET MATCHES "(.*)@(.*)")
+        set(RunCMake_CXXModules_TARGET "${CMAKE_MATCH_1}")
+        set(RunCMake_CXXModules_CONFIG "${CMAKE_MATCH_2}")
+        set(RunCMake_CXXModules_NAME_SUFFIX "-${RunCMake_CXXModules_CONFIG}")
+      endif ()
+      run_cmake_command("${test_name}-target-${RunCMake_CXXModules_TARGET}${RunCMake_CXXModules_NAME_SUFFIX}" "${CMAKE_COMMAND}" --build . --target "${RunCMake_CXXModules_TARGET}" --config "${RunCMake_CXXModules_CONFIG}")
+    endforeach ()
+  endif ()
+  if (RunCMake_CXXModules_INSTALL)
+    run_cmake_command("${test_name}-install" "${CMAKE_COMMAND}" --build . --target install --config Debug)
+  endif ()
+  if (NOT RunCMake_CXXModules_NO_TEST)
+    run_cmake_command("${test_name}-test" "${CMAKE_CTEST_COMMAND}" -C Debug --output-on-failure)
+  endif ()
+  if (RunCMake_CXXModules_REBUILD)
+    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
+    include("${RunCMake_TEST_SOURCE_DIR}/pre-rebuild.cmake")
+    execute_process(COMMAND ${CMAKE_COMMAND} -E sleep 1.125) # handle 1s resolution
+    run_cmake_command("${test_name}-rebuild" "${CMAKE_COMMAND}" --build . --config Debug)
+  endif ()
+endfunction ()
+
+function (run_cxx_module_test_target directory target)
+  set(RunCMake_CXXModules_TARGET "${target}")
+  set(RunCMake_CXXModules_NO_TEST 1)
+  run_cxx_module_test("${directory}" ${ARGN})
+endfunction ()
+
+function (run_cxx_module_test_rebuild directory)
+  set(RunCMake_CXXModules_INSTALL 0)
+  set(RunCMake_CXXModules_NO_TEST 1)
+  set(RunCMake_CXXModules_REBUILD 1)
+  run_cxx_module_test("${directory}" ${ARGN})
+endfunction ()
+
+if (RunCMake_GENERATOR MATCHES "Ninja")
+  if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+    set(ninja_cmp0154_target "CMakeFiles/ninja_cmp0154.dir/Debug/unrelated.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
+  else ()
+    set(ninja_cmp0154_target "CMakeFiles/ninja_cmp0154.dir/unrelated.cxx${CMAKE_CXX_OUTPUT_EXTENSION}")
+  endif ()
+  run_cxx_module_test_target(ninja-cmp0154 "${ninja_cmp0154_target}")
+endif ()
+
+run_cxx_module_test(scan-with-pch)
+
+# Tests which use named modules.
+if ("named" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  run_cxx_module_test(simple)
+  run_cxx_module_test(file-sets-with-dot)
+  run_cxx_module_test(vs-without-flags)
+  run_cxx_module_test(library library-static -DBUILD_SHARED_LIBS=OFF)
+  run_cxx_module_test(unity-build)
+  run_cxx_module_test(object-library)
+  run_cxx_module_test(generated)
+  run_cxx_module_test(deep-chain)
+  run_cxx_module_test(non-trivial-collation-order)
+  run_cxx_module_test(non-trivial-collation-order-randomized)
+  run_cxx_module_test(duplicate)
+  set(RunCMake_CXXModules_NO_TEST 1)
+  run_cxx_module_test(imp-from-object)
+  run_cxx_module_test(circular)
+  run_cxx_module_test(try-compile)
+  run_cxx_module_test(try-run)
+  unset(RunCMake_CXXModules_NO_TEST)
+  run_cxx_module_test(same-src-name)
+  run_cxx_module_test(scan_props)
+  run_cxx_module_test(target-objects)
+
+  if ("cxx_std_23" IN_LIST CMAKE_CXX_COMPILE_FEATURES AND
+      "import_std23" IN_LIST CMake_TEST_MODULE_COMPILATION)
+    run_cxx_module_test(imp-std)
+    set(RunCMake_CXXModules_NO_TEST 1)
+    run_cxx_module_test(imp-std-no-std-prop)
+    unset(RunCMake_CXXModules_NO_TEST)
+    run_cxx_module_test(imp-std-exp-no-std-build)
+    set(RunCMake_CXXModules_INSTALL 1)
+    run_cxx_module_test(imp-std-exp-no-std-install)
+    unset(RunCMake_CXXModules_INSTALL)
+
+    if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION)
+      run_cxx_module_test(imp-std-not-in-exp-build)
+      run_cxx_module_test(imp-std-trans imp-std-trans-not-in-exp-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/imp-std-not-in-exp-build-build")
+
+      set(RunCMake_CXXModules_INSTALL 1)
+      run_cxx_module_test(imp-std-not-in-exp-install)
+      unset(RunCMake_CXXModules_INSTALL)
+      run_cxx_module_test(imp-std-trans imp-std-trans-not-in-exp-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/imp-std-not-in-exp-install-install")
+
+      run_cxx_module_test(imp-std-trans imp-std-trans-exp-no-std-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/imp-std-exp-no-std-build-build" -DEXPORT_NO_STD=1)
+      run_cxx_module_test(imp-std-trans imp-std-trans-exp-no-std-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/imp-std-exp-no-std-install-install" -DEXPORT_NO_STD=1)
+    endif ()
+  endif ()
+endif ()
+
+# Tests which require compile commands support.
+if ("compile_commands" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  run_cxx_module_test(exp-compile-commands)
+endif ()
+
+macro (setup_export_build_database_targets)
+  set(RunCMake_CXXModules_TARGETS
+    cmake_build_database-CXX
+    cmake_build_database)
+
+  if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+    list(INSERT RunCMake_CXXModules_TARGETS 0
+      cmake_build_database-CXX-Debug
+      cmake_build_database-Debug
+      # Other config targets.
+      cmake_build_database-CXX-Release@Release
+      cmake_build_database-Release@Release)
+  endif ()
+endmacro ()
+
+# Tests which require build database support.
+if ("build_database" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  setup_export_build_database_targets()
+  set(RunCMake_CXXModules_NO_TEST 1)
+
+  run_cxx_module_test(exp-builddb)
+
+  unset(RunCMake_CXXModules_NO_TEST)
+  unset(RunCMake_CXXModules_TARGETS)
+endif ()
+
+# Tests which require collation work.
+if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  run_cxx_module_test(duplicate-sources)
+  run_cxx_module_test(public-req-priv)
+  set(RunCMake_CXXModules_NO_TEST 1)
+  run_cxx_module_test(req-priv-other-target)
+  unset(RunCMake_CXXModules_NO_TEST)
+  run_cxx_module_test_rebuild(depchain-modmap)
+  run_cxx_module_test_rebuild(depchain-mods-json-file)
+  if (RunCMake_GENERATOR MATCHES "Ninja")
+    run_cxx_module_test_rebuild(depchain-collation-restat)
+  endif ()
+endif ()
+
+# Tests which use named modules in shared libraries.
+if ("shared" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  run_cxx_module_test(library library-shared -DBUILD_SHARED_LIBS=ON)
+endif ()
+
+# Tests which use partitions.
+if ("partitions" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  run_cxx_module_test(partitions)
+endif ()
+
+# Tests which use internal partitions.
+if ("internal_partitions" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  run_cxx_module_test(internal-partitions)
+endif ()
+
+function (run_cxx_module_import_test type name)
+  set(RunCMake_CXXModules_INSTALL 0)
+
+  if ("EXPORT_BUILD_DATABASE" IN_LIST ARGN)
+    list(REMOVE_ITEM ARGN EXPORT_BUILD_DATABASE)
+    list(APPEND ARGN -DCMAKE_EXPORT_BUILD_DATABASE=1)
+  endif ()
+
+  run_cxx_module_test(imp-mods "imp-mods-${name}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/${name}-${type}" ${ARGN})
+endfunction ()
+
+# Tests which install BMIs
+if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  run_cxx_module_test(exp-iface-no-props-build)
+  run_cxx_module_test(exp-iface-build)
+  run_cxx_module_test(exp-incdirs-build)
+  run_cxx_module_test(exp-incdirs-old-cmake-build)
+  run_cxx_module_test(exp-usage-build)
+  run_cxx_module_test(exp-bmi-and-iface-build)
+  run_cxx_module_test(exp-command-sepdir-build)
+  run_cxx_module_test(exp-trans-targets-build)
+  run_cxx_module_test(exp-trans-mods1-build)
+  run_cxx_module_test(exp-trans-mods-build exp-trans-mods-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/exp-trans-mods1-build-build" )
+  run_cxx_module_test(exp-with-headers-build)
+
+  if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND
+      "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
+    run_cxx_module_import_test(build exp-iface-build)
+    run_cxx_module_import_test(build exp-iface-no-props-build -DNO_PROPERTIES=1)
+    run_cxx_module_import_test(build exp-incdirs-build -DINCLUDE_PROPERTIES=1)
+    run_cxx_module_import_test(build exp-bmi-and-iface-build -DWITH_BMIS=1)
+    run_cxx_module_import_test(build exp-command-sepdir-build -DEXPORT_COMMAND_SEPDIR=1)
+    run_cxx_module_import_test(build exp-trans-targets-build -DTRANSITIVE_TARGETS=1)
+    run_cxx_module_import_test(build exp-trans-mods-build -DTRANSITIVE_MODULES=1)
+    run_cxx_module_import_test(build exp-with-headers-build -DWITH_HEADERS=1)
+
+    if ("build_database" IN_LIST CMake_TEST_MODULE_COMPILATION)
+      setup_export_build_database_targets()
+
+      run_cxx_module_import_test(build exp-builddb -DBUILD_DATABASE=1 EXPORT_BUILD_DATABASE)
+
+      unset(RunCMake_CXXModules_TARGETS)
+    endif ()
+  endif ()
+endif ()
+
+# All of the following tests perform installation.
+set(RunCMake_CXXModules_INSTALL 1)
+
+# Tests which install BMIs
+if ("install_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  run_cxx_module_test(install-bmi)
+  run_cxx_module_test(install-bmi-and-ifaces)
+
+  if ("export_bmi" IN_LIST CMake_TEST_MODULE_COMPILATION)
+    run_cxx_module_test(exp-iface-no-props-install)
+    run_cxx_module_test(exp-iface-install)
+    run_cxx_module_test(exp-incdirs-install)
+    run_cxx_module_test(exp-incdirs-old-cmake-install)
+    run_cxx_module_test(exp-usage-install)
+    run_cxx_module_test(exp-bmi-and-iface-install)
+    run_cxx_module_test(exp-command-sepdir-install)
+    run_cxx_module_test(exp-trans-targets-install)
+    run_cxx_module_test(exp-trans-mods1-install)
+    run_cxx_module_test(exp-trans-mods-install exp-trans-mods-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/exp-trans-mods1-install-install" )
+    run_cxx_module_test(exp-with-headers-install)
+
+    if ("collation" IN_LIST CMake_TEST_MODULE_COMPILATION AND
+        "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
+      run_cxx_module_import_test(install exp-iface-install)
+      run_cxx_module_import_test(install exp-iface-no-props-install -DNO_PROPERTIES=1)
+      run_cxx_module_import_test(install exp-incdirs-install -DINCLUDE_PROPERTIES=1)
+      run_cxx_module_import_test(install exp-bmi-and-iface-install -DWITH_BMIS=1)
+      run_cxx_module_import_test(install exp-command-sepdir-install -DEXPORT_COMMAND_SEPDIR=1)
+      run_cxx_module_import_test(install exp-trans-targets-install -DTRANSITIVE_TARGETS=1)
+      run_cxx_module_import_test(install exp-trans-mods-install -DTRANSITIVE_MODULES=1)
+      run_cxx_module_import_test(install exp-with-headers-install -DWITH_HEADERS=1)
+    endif ()
+  endif ()
+endif ()
+
+# All remaining tests require a working `Ninja` generator to set up a test case
+# for the current generator.
+if (NOT "ninja" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  return ()
+endif ()
+# All remaining tests require `bmionly` in order to consume from the `ninja`
+# build.
+if (NOT "bmionly" IN_LIST CMake_TEST_MODULE_COMPILATION)
+  return ()
+endif ()
+
+function (run_cxx_module_test_ninja directory)
+  set(RunCMake_GENERATOR "Ninja")
+  set(RunCMake_CXXModules_NO_TEST 1)
+  set(RunCMake_CXXModules_INSTALL 1)
+  # `Ninja` is not a multi-config generator.
+  set(RunCMake_GENERATOR_IS_MULTI_CONFIG 0)
+  run_cxx_module_test("${directory}" "${directory}-ninja" ${ARGN})
+endfunction ()
+
+# Installation happens within `run_cxx_module_test_ninja`.
+set(RunCMake_CXXModules_INSTALL 0)
+
+set(test_set mods-from-ninja)
+run_cxx_module_test_ninja("exp-${test_set}")
+run_cxx_module_test(imp-mods "imp-${test_set}" "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/exp-${test_set}-ninja-install" -DFROM_NINJA=1)
diff --git a/Tests/RunCMake/CXXModules/examples/build-database-check.cmake b/Tests/RunCMake/CXXModulesCompile/build-database-check.cmake
similarity index 98%
rename from Tests/RunCMake/CXXModules/examples/build-database-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/build-database-check.cmake
index 9b440a8440..c1cf629c35 100644
--- a/Tests/RunCMake/CXXModules/examples/build-database-check.cmake
+++ b/Tests/RunCMake/CXXModulesCompile/build-database-check.cmake
@@ -1,4 +1,4 @@
-include("${CMAKE_CURRENT_LIST_DIR}/../check-json.cmake")
+include("${CMAKE_CURRENT_LIST_DIR}/check-json.cmake")
 
 function (check_build_database expect_basename fname component)
   if (component STREQUAL "NO_EXIST")
diff --git a/Tests/RunCMake/CXXModulesCompile/check-json.cmake b/Tests/RunCMake/CXXModulesCompile/check-json.cmake
new file mode 100644
index 0000000000..09edc33e5b
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/check-json.cmake
@@ -0,0 +1,227 @@
+function (json_placeholders in out)
+  string(REPLACE "<CONFIG>" "${CXXModules_config}" in "${in}")
+  string(TOLOWER "${CXXModules_config}" config_lower)
+  string(REPLACE "<CONFIG_LOWER>" "${config_lower}" in "${in}")
+  string(REPLACE "<CONFIG_OTHER>" "${CXXModules_config_other}" in "${in}")
+  string(TOLOWER "${CXXModules_config_other}" config_lower)
+  string(REPLACE "<CONFIG_OTHER_LOWER>" "${config_lower}" in "${in}")
+  if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+    string(REPLACE "<CONFIG_DIR>" "/${CXXModules_config}" in "${in}")
+    string(REPLACE "<CONFIG_OTHER_DIR>" "/${CXXModules_config_other}" in "${in}")
+  else ()
+    string(REPLACE "<CONFIG_DIR>" "" in "${in}")
+    string(REPLACE "<CONFIG_OTHER_DIR>" "" in "${in}")
+  endif ()
+  if (CMAKE_BUILD_TYPE)
+    string(REPLACE "<CONFIG_FORCE>" "${CXXModules_config}" in "${in}")
+    string(REPLACE "<CONFIG_OTHER_FORCE>" "${CXXModules_config_other}" in "${in}")
+  else ()
+    string(REPLACE "<CONFIG_FORCE>" "noconfig" in "${in}")
+  endif ()
+  string(REPLACE "<SOURCE_DIR>" "${RunCMake_SOURCE_DIR}" in "${in}")
+  string(REPLACE "<BINARY_DIR>" "${RunCMake_TEST_BINARY_DIR}" in "${in}")
+  string(REPLACE "<OBJEXT>" "${CMAKE_CXX_OUTPUT_EXTENSION}" in "${in}")
+  if (CMAKE_CXX_MODULE_MAP_FORMAT STREQUAL "gcc")
+    set(bmiflag "-fmodule-only")
+    set(bmiext "gcm")
+  elseif (CMAKE_CXX_MODULE_MAP_FORMAT STREQUAL "clang")
+    set(bmiflag "--precompile")
+    set(bmiext "pcm")
+  elseif (CMAKE_CXX_MODULE_MAP_FORMAT STREQUAL "msvc")
+    set(bmiflag "-ifcOutput.*")
+    set(bmiext "ifc")
+  endif ()
+  string(REPLACE "<BMI_ONLY_FLAG>" "${bmiflag}" in "${in}")
+  string(REPLACE "<BMIEXT>" ".${bmiext}" in "${in}")
+  set(output_flag "-o")
+  if (CMAKE_CXX_COMPILER_FRONTEND_VARIANT STREQUAL "MSVC")
+    set(output_flag "-Fo")
+  endif ()
+  string(REPLACE "<OUTPUT_FLAG>" "${output_flag}" in "${in}")
+  string(REPLACE "<CXX20_OPTION>" "${CMAKE_CXX20_STANDARD_COMPILE_OPTION}" in "${in}")
+  string(REPLACE "<HEX>" "[0-9a-f]+" in "${in}")
+  string(REPLACE "REGEX:" "" in "${in}")
+  string(REPLACE "PATH:" "" in "${in}")
+  set("${out}" "${in}" PARENT_SCOPE)
+endfunction ()
+
+function (check_json_value path actual_type expect_type actual_value expect_value)
+  if (NOT actual_type STREQUAL expect_type)
+    string(APPEND RunCMake_TEST_FAILED
+      "Type mismatch at:\n ${path}\nexpected:\n ${expect_type}\nactual:\n ${actual_type}\n")
+    set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE)
+    return ()
+  endif ()
+
+  if (actual_type STREQUAL NULL)
+    # Nothing to check
+  elseif (actual_type STREQUAL BOOLEAN)
+    if (NOT actual_value STREQUAL expect_value)
+      string(APPEND RunCMake_TEST_FAILED
+        "Boolean mismatch at:\n ${path}\nexpected:\n ${expect_value}\nactual:\n ${actual_value}\n")
+    endif ()
+  elseif (actual_type STREQUAL NUMBER)
+    if (NOT actual_value EQUAL expect_value)
+      string(APPEND RunCMake_TEST_FAILED
+        "Number mismatch at:\n ${path}\nexpected:\n ${expect_value}\nactual:\n ${actual_value}\n")
+    endif ()
+  elseif (actual_type STREQUAL STRING)
+    # Allow some values to be ignored.
+    if (expect_value STREQUAL "<IGNORE>")
+      return ()
+    endif ()
+
+    json_placeholders("${expect_value}" expect_value_expanded)
+    if (expect_value MATCHES "^REGEX:PATH:")
+      string(REPLACE "\\" "/" actual_value_check "${actual_value}")
+      string(REGEX REPLACE "^\"(.*)\"$" "\\1" actual_value_check "${actual_value_check}")
+      if (NOT actual_value_check MATCHES "^${expect_value_expanded}$")
+        string(APPEND RunCMake_TEST_FAILED
+          "String mismatch (path regex) at:\n ${path}\nexpected:\n ^${expect_value_expanded}$\nactual:\n ${actual_value}\n")
+      endif ()
+    elseif (expect_value MATCHES "^REGEX:")
+      if (NOT actual_value MATCHES "^${expect_value_expanded}$")
+        string(APPEND RunCMake_TEST_FAILED
+          "String mismatch (regex) at:\n ${path}\nexpected:\n ^${expect_value_expanded}$\nactual:\n ${actual_value}\n")
+      endif ()
+    elseif (expect_value MATCHES "^PATH:")
+      string(REPLACE "\\" "/" actual_value_check "${actual_value}")
+      string(REGEX REPLACE "^\"(.*)\"$" "\\1" actual_value_check "${actual_value_check}")
+      if (NOT actual_value_check STREQUAL "${expect_value_expanded}")
+        string(APPEND RunCMake_TEST_FAILED
+          "String mismatch (path) at:\n ${path}\nexpected:\n ${expect_value_expanded}\nactual:\n ${actual_value}\n")
+      endif ()
+    elseif (NOT actual_value STREQUAL expect_value_expanded)
+      string(APPEND RunCMake_TEST_FAILED
+        "String mismatch at:\n ${path}\nexpected:\n ${expect_value_expanded}\nactual:\n ${actual_value}\n")
+    endif ()
+  elseif (actual_type STREQUAL ARRAY)
+    check_json_array("${path}" "${actual_value}" "${expect_value}")
+  elseif (actual_type STREQUAL OBJECT)
+    check_json_object("${path}" "${actual_value}" "${expect_value}")
+  endif ()
+
+  set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE)
+endfunction ()
+
+# Check that two arrays are the same.
+function (check_json_array path actual expect)
+  if (item_filter)
+    string(JSON iter_len LENGTH "${actual}")
+    set(idx 0)
+    while (idx LESS iter_len)
+      string(JSON type TYPE "${actual}" "${idx}")
+      string(JSON item GET "${actual}" "${idx}")
+      if (type STREQUAL "STRING" AND
+          item MATCHES "${item_filter}")
+        string(JSON actual REMOVE "${actual}" "${idx}")
+        math(EXPR iter_len "${iter_len} - 1")
+      else ()
+        math(EXPR idx "${idx} + 1")
+      endif ()
+    endwhile ()
+  endif ()
+
+  string(JSON actual_len LENGTH "${actual}")
+  string(JSON expect_len LENGTH "${expect}")
+
+  set(iter_len "${actual_len}")
+  if (actual_len LESS expect_len)
+    string(APPEND RunCMake_TEST_FAILED
+      "Missing array items at:\n ${path}\n")
+  elseif (expect_len LESS actual_len)
+    string(APPEND RunCMake_TEST_FAILED
+      "Extra array items at:\n ${path}\n")
+    set(iter_len "${expect_len}")
+  endif ()
+
+  foreach (idx RANGE "${iter_len}")
+    if (idx EQUAL iter_len)
+      break ()
+    endif ()
+
+    set(new_path "${path}[${idx}]")
+    string(JSON actual_type TYPE "${actual}" "${idx}")
+    string(JSON expect_type TYPE "${expect}" "${idx}")
+    string(JSON actual_value GET "${actual}" "${idx}")
+    string(JSON expect_value GET "${expect}" "${idx}")
+    check_json_value("${new_path}" "${actual_type}" "${expect_type}" "${actual_value}" "${expect_value}")
+  endforeach ()
+
+  set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE)
+endfunction ()
+
+# Check that two inner objects are the same.
+function (check_json_object path actual expect)
+  string(JSON actual_len LENGTH "${actual}")
+  string(JSON expect_len LENGTH "${expect}")
+
+  set(actual_keys "")
+  set(expect_keys "")
+  foreach (idx RANGE "${actual_len}")
+    if (idx EQUAL actual_len)
+      break ()
+    endif ()
+
+    string(JSON actual_key MEMBER "${actual}" "${idx}")
+    list(APPEND actual_keys "${actual_key}")
+  endforeach ()
+  foreach (idx RANGE "${expect_len}")
+    if (idx EQUAL expect_len)
+      break ()
+    endif ()
+
+    string(JSON expect_key MEMBER "${expect}" "${idx}")
+    list(APPEND expect_keys "${expect_key}")
+  endforeach ()
+
+  json_placeholders("${expect_keys}" expect_keys_expanded)
+
+  set(actual_keys_missed "${actual_keys}")
+  set(expect_keys_missed "${expect_keys}")
+
+  set(common_keys "")
+  set(expect_keys_stack "${expect_keys}")
+  while (expect_keys_stack)
+    list(POP_BACK expect_keys_stack expect_key)
+    json_placeholders("${expect_key}" expect_key_expanded)
+
+    if (expect_key_expanded IN_LIST actual_keys_missed AND
+        expect_key IN_LIST expect_keys_missed)
+      list(APPEND common_keys "${expect_key}")
+    endif ()
+
+    list(REMOVE_ITEM actual_keys_missed "${expect_key_expanded}")
+    list(REMOVE_ITEM expect_keys_missed "${expect_key}")
+  endwhile ()
+
+  if (actual_keys_missed)
+    string(REPLACE ";" ", " actual_keys_missed_text "${actual_keys_missed}")
+    string(APPEND RunCMake_TEST_FAILED
+      "Extra unexpected members at:\n ${path}\nactual:\n ${actual_keys_missed_text}\n")
+  endif ()
+  if (expect_keys_missed)
+    string(REPLACE ";" ", " expect_keys_missed_text "${expect_keys_missed}")
+    string(APPEND RunCMake_TEST_FAILED
+      "Missing expected members at\n ${path}\nactual:\n ${expect_keys_missed_text}\n")
+  endif ()
+
+  foreach (key IN LISTS common_keys)
+    json_placeholders("${key}" key_expanded)
+    set(new_path "${path}.${key_expanded}")
+    string(JSON actual_type TYPE "${actual}" "${key_expanded}")
+    string(JSON expect_type TYPE "${expect}" "${key}")
+    string(JSON actual_value GET "${actual}" "${key_expanded}")
+    string(JSON expect_value GET "${expect}" "${key}")
+    check_json_value("${new_path}" "${actual_type}" "${expect_type}" "${actual_value}" "${expect_value}")
+  endforeach ()
+
+  set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE)
+endfunction ()
+
+# Check that two JSON objects are the same.
+function (check_json actual expect)
+  check_json_object("" "${actual}" "${expect}")
+
+  set(RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}" PARENT_SCOPE)
+endfunction ()
diff --git a/Tests/RunCMake/CXXModules/examples/circular-build-result.txt b/Tests/RunCMake/CXXModulesCompile/circular-build-result.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/circular-build-result.txt
rename to Tests/RunCMake/CXXModulesCompile/circular-build-result.txt
diff --git a/Tests/RunCMake/CXXModules/examples/circular-build-stdout.txt b/Tests/RunCMake/CXXModulesCompile/circular-build-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/circular-build-stdout.txt
rename to Tests/RunCMake/CXXModulesCompile/circular-build-stdout.txt
diff --git a/Tests/RunCMake/CXXModules/examples/circular/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/circular/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/circular/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/circular/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/circular/circular-a.cppm b/Tests/RunCMake/CXXModulesCompile/circular/circular-a.cppm
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/circular/circular-a.cppm
rename to Tests/RunCMake/CXXModulesCompile/circular/circular-a.cppm
diff --git a/Tests/RunCMake/CXXModules/examples/circular/circular-b.cppm b/Tests/RunCMake/CXXModulesCompile/circular/circular-b.cppm
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/circular/circular-b.cppm
rename to Tests/RunCMake/CXXModulesCompile/circular/circular-b.cppm
diff --git a/Tests/RunCMake/CXXModules/examples/cxx-modules-find-bmi-and-interfaces.cmake b/Tests/RunCMake/CXXModulesCompile/cxx-mods-find-bmi-and-ifaces.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/cxx-modules-find-bmi-and-interfaces.cmake
rename to Tests/RunCMake/CXXModulesCompile/cxx-mods-find-bmi-and-ifaces.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/cxx-modules-find-bmi.cmake b/Tests/RunCMake/CXXModulesCompile/cxx-modules-find-bmi.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/cxx-modules-find-bmi.cmake
rename to Tests/RunCMake/CXXModulesCompile/cxx-modules-find-bmi.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/cxx-modules-rules.cmake b/Tests/RunCMake/CXXModulesCompile/cxx-modules-rules.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/cxx-modules-rules.cmake
rename to Tests/RunCMake/CXXModulesCompile/cxx-modules-rules.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/deep-chain/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/deep-chain/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/deep-chain/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/deep-chain/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/deep-chain/a.cxx b/Tests/RunCMake/CXXModulesCompile/deep-chain/a.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/deep-chain/a.cxx
rename to Tests/RunCMake/CXXModulesCompile/deep-chain/a.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/deep-chain/b.cxx b/Tests/RunCMake/CXXModulesCompile/deep-chain/b.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/deep-chain/b.cxx
rename to Tests/RunCMake/CXXModulesCompile/deep-chain/b.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/deep-chain/c.cxx b/Tests/RunCMake/CXXModulesCompile/deep-chain/c.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/deep-chain/c.cxx
rename to Tests/RunCMake/CXXModulesCompile/deep-chain/c.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/deep-chain/d.cxx b/Tests/RunCMake/CXXModulesCompile/deep-chain/d.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/deep-chain/d.cxx
rename to Tests/RunCMake/CXXModulesCompile/deep-chain/d.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/deep-chain/e.cxx b/Tests/RunCMake/CXXModulesCompile/deep-chain/e.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/deep-chain/e.cxx
rename to Tests/RunCMake/CXXModulesCompile/deep-chain/e.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/deep-chain/main.cxx b/Tests/RunCMake/CXXModulesCompile/deep-chain/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/deep-chain/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/deep-chain/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-collation-restat-rebuild-check.cmake b/Tests/RunCMake/CXXModulesCompile/depchain-collation-restat-rebuild-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-collation-restat-rebuild-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/depchain-collation-restat-rebuild-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-collation-restat/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/depchain-collation-restat/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-collation-restat/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/depchain-collation-restat/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-collation-restat/importable.cxx b/Tests/RunCMake/CXXModulesCompile/depchain-collation-restat/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-collation-restat/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/depchain-collation-restat/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-collation-restat/main.cxx b/Tests/RunCMake/CXXModulesCompile/depchain-collation-restat/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-collation-restat/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/depchain-collation-restat/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-collation-restat/pre-rebuild.cmake b/Tests/RunCMake/CXXModulesCompile/depchain-collation-restat/pre-rebuild.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-collation-restat/pre-rebuild.cmake
rename to Tests/RunCMake/CXXModulesCompile/depchain-collation-restat/pre-rebuild.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap-rebuild-check.cmake b/Tests/RunCMake/CXXModulesCompile/depchain-modmap-rebuild-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modmap-rebuild-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/depchain-modmap-rebuild-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/depchain-modmap/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modmap/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/depchain-modmap/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap/importable.cxx b/Tests/RunCMake/CXXModulesCompile/depchain-modmap/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modmap/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/depchain-modmap/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap/main.cxx b/Tests/RunCMake/CXXModulesCompile/depchain-modmap/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modmap/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/depchain-modmap/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modmap/pre-rebuild.cmake b/Tests/RunCMake/CXXModulesCompile/depchain-modmap/pre-rebuild.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modmap/pre-rebuild.cmake
rename to Tests/RunCMake/CXXModulesCompile/depchain-modmap/pre-rebuild.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modules-json-file-rebuild-check.cmake b/Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file-rebuild-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modules-json-file-rebuild-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file-rebuild-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modules-json-file/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modules-json-file/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modules-json-file/importable.cxx b/Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modules-json-file/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modules-json-file/main.cxx b/Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modules-json-file/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/depchain-modules-json-file/pre-rebuild.cmake b/Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file/pre-rebuild.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/depchain-modules-json-file/pre-rebuild.cmake
rename to Tests/RunCMake/CXXModulesCompile/depchain-mods-json-file/pre-rebuild.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/duplicate-sources-stderr.txt b/Tests/RunCMake/CXXModulesCompile/duplicate-sources-stderr.txt
similarity index 75%
rename from Tests/RunCMake/CXXModules/examples/duplicate-sources-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/duplicate-sources-stderr.txt
index d3960f6d44..1dfe3d3688 100644
--- a/Tests/RunCMake/CXXModules/examples/duplicate-sources-stderr.txt
+++ b/Tests/RunCMake/CXXModulesCompile/duplicate-sources-stderr.txt
@@ -2,7 +2,7 @@ CMake Warning \(dev\) in CMakeLists\.txt:
   Target "duplicate_sources" has source file
 
     [^
-]*/Tests/RunCMake/CXXModules/examples/duplicate-sources/duplicate\.cxx
+]*/Tests/RunCMake/CXXModulesCompile/duplicate-sources/duplicate\.cxx
 
   in a "FILE_SET TYPE CXX_MODULES" multiple times\.
 This warning is for project developers\.  Use -Wno-dev to suppress it\.
diff --git a/Tests/RunCMake/CXXModules/examples/duplicate-sources/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/duplicate-sources/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/duplicate-sources/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/duplicate-sources/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/duplicate-sources/duplicate.cxx b/Tests/RunCMake/CXXModulesCompile/duplicate-sources/duplicate.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/duplicate-sources/duplicate.cxx
rename to Tests/RunCMake/CXXModulesCompile/duplicate-sources/duplicate.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/duplicate-sources/main.cxx b/Tests/RunCMake/CXXModulesCompile/duplicate-sources/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/duplicate-sources/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/duplicate-sources/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/duplicate/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/duplicate/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/duplicate/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/duplicate/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/duplicate/duplicate.cxx b/Tests/RunCMake/CXXModulesCompile/duplicate/duplicate.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/duplicate/duplicate.cxx
rename to Tests/RunCMake/CXXModulesCompile/duplicate/duplicate.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/duplicate/main.cxx b/Tests/RunCMake/CXXModulesCompile/duplicate/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/duplicate/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/duplicate/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-bmi-and-interface-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-bmi-and-iface-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModulesCompile/exp-builddb-build-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-build-check.cmake
new file mode 100644
index 0000000000..303842fb5c
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/exp-builddb-build-check.cmake
@@ -0,0 +1,19 @@
+include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
+
+check_build_database("exp-builddb" "build_database.json" NO_EXIST)
+check_build_database("exp-builddb" "build_database_CXX.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("exp-builddb" "CMakeFiles/export_build_database.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
+
+  # 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("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/CXXModules/examples/export-build-database-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database-stderr.txt b/Tests/RunCMake/CXXModulesCompile/exp-builddb-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb-stderr.txt
diff --git a/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database-check.cmake
new file mode 100644
index 0000000000..9c16a2f3d7
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database-check.cmake
@@ -0,0 +1,21 @@
+include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
+
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb" "build_database.json" ALL_MULTI)
+  check_build_database("exp-builddb" "build_database_CXX.json" JUST_CXX_MULTI)
+
+  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("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("exp-builddb" "build_database.json" ALL)
+  check_build_database("exp-builddb" "build_database_CXX.json" JUST_CXX)
+
+  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/CXXModules/examples/export-build-database-target-cmake_build_database/CXX-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/CXX-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/CXX/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/CXX/Debug-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/CXX/Release-Release-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Debug-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/Debug-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Debug-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Release-Release-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database-target-cmake_build_database/Release-Release-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb-target-cmake_build_database/Release-Release-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-builddb/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database/dep_interface_include/anchor b/Tests/RunCMake/CXXModulesCompile/exp-builddb/dep_interface_include/anchor
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database/dep_interface_include/anchor
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb/dep_interface_include/anchor
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-builddb/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database/lib.cxx b/Tests/RunCMake/CXXModulesCompile/exp-builddb/lib.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database/lib.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb/lib.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database/target_interface_include/anchor b/Tests/RunCMake/CXXModulesCompile/exp-builddb/target_interface_include/anchor
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database/target_interface_include/anchor
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb/target_interface_include/anchor
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database/target_public_include/anchor b/Tests/RunCMake/CXXModulesCompile/exp-builddb/target_public_include/anchor
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database/target_public_include/anchor
rename to Tests/RunCMake/CXXModulesCompile/exp-builddb/target_public_include/anchor
diff --git a/Tests/RunCMake/CXXModules/examples/export-command-sepdir-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-command-sepdir-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-command-sepdir-build/subdir/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/subdir/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-command-sepdir-build/subdir/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/subdir/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-command-sepdir-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-command-sepdir-build/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-command-sepdir-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-command-sepdir-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-command-sepdir-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-command-sepdir-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-command-sepdir-install/subdir/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/subdir/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-command-sepdir-install/subdir/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/subdir/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-command-sepdir-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-command-sepdir-install/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-command-sepdir-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-command-sepdir-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-command-sepdir-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-compile-commands-check.cmake b/Tests/RunCMake/CXXModulesCompile/exp-compile-commands-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-compile-commands-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/exp-compile-commands-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/export-compile-commands/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-compile-commands/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-compile-commands/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-compile-commands/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-compile-commands/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-compile-commands/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-compile-commands/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-compile-commands/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-compile-commands/main.cxx b/Tests/RunCMake/CXXModulesCompile/exp-compile-commands/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-compile-commands/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-compile-commands/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-iface-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-build/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-build/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-build/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-build/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-build/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-build/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-build/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-build/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-iface-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-iface-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-install/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-install/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-install/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-install/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-install/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-install/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-install/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-install/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-iface-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-build/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-build/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-build/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-build/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-install/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-install/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-install/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-install/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-iface-no-props-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/include/include.h b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/include/include.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/include/include.h
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/include/include.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/includes/includes.h b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/includes/includes.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/includes/includes.h
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/includes/includes.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-build/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/include/include.h b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/include/include.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/include/include.h
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/include/include.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/includes/includes.h b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/includes/includes.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/includes/includes.h
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/includes/includes.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-interface-no-properties-install/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-include-directories-old-cmake-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-incdirs-old-cmake-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-modules-from-ninja/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-mods-from-ninja/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules1-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-modules1-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-mods1-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/include/include.h b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/include/include.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/include/include.h
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/include/include.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/includes/includes.h b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/includes/includes.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/includes/includes.h
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/includes/includes.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/include/include.h b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/include/include.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/include/include.h
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/include/include.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/includes/includes.h b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/includes/includes.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/includes/includes.h
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/includes/includes.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/no_modules.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/no_modules.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/no_modules.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/no_modules.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/subdir/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/subdir/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/subdir/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/subdir/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-transitive-targets-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-trans-targets-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-usage-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-build/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-usage-build/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-build/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-build/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-usage-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-build/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-usage-build/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-build/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-build/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-usage-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-usage-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-install/forward.cxx b/Tests/RunCMake/CXXModulesCompile/exp-usage-install/forward.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-install/forward.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-install/forward.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-usage-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-install/private.cxx b/Tests/RunCMake/CXXModulesCompile/exp-usage-install/private.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-install/private.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-install/private.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-usage-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-usage-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-usage-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-usage-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-with-headers-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-with-headers-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-with-headers-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-with-headers-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-with-headers-build/include/subdir/header.h b/Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/include/subdir/header.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-with-headers-build/include/subdir/header.h
rename to Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/include/subdir/header.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-with-headers-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-with-headers-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-with-headers-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-with-headers-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-with-headers-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/export-with-headers-install/importable.cxx b/Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-with-headers-install/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/export-with-headers-install/include/subdir/header.h b/Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/include/subdir/header.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-with-headers-install/include/subdir/header.h
rename to Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/include/subdir/header.h
diff --git a/Tests/RunCMake/CXXModules/examples/export-with-headers-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-with-headers-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/exp-with-headers-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all-multi.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-all-multi.json
similarity index 65%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-all-multi.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-all-multi.json
index ffb74cbb03..1cb79bb217 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all-multi.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-all-multi.json
@@ -14,10 +14,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -29,7 +29,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -37,10 +37,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -56,10 +56,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -73,7 +73,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -84,10 +84,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -101,7 +101,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -109,10 +109,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -128,10 +128,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -149,7 +149,7 @@
             "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -167,10 +167,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -182,7 +182,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -190,10 +190,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -209,10 +209,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -226,7 +226,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -237,10 +237,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -254,7 +254,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -262,10 +262,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -281,10 +281,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -302,7 +302,7 @@
             "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-target.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-all.json
similarity index 65%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-target.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-all.json
index 4412d35b10..9b13bd0184 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-target.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-all.json
@@ -14,10 +14,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -29,7 +29,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -37,10 +37,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -56,10 +56,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -73,7 +73,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -84,10 +84,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -101,7 +101,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -109,10 +109,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -128,10 +128,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -149,7 +149,7 @@
             "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-config.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-config.json
similarity index 65%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-config.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-config.json
index 3815df5412..0253351a98 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-config.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-config.json
@@ -14,10 +14,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -29,7 +29,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -37,10 +37,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -56,10 +56,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -73,7 +73,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -84,10 +84,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -101,7 +101,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -109,10 +109,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -128,10 +128,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -149,7 +149,7 @@
             "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx-config.json
similarity index 65%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx-config.json
index 3815df5412..0253351a98 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx-config.json
@@ -14,10 +14,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -29,7 +29,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -37,10 +37,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -56,10 +56,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -73,7 +73,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -84,10 +84,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -101,7 +101,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -109,10 +109,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -128,10 +128,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -149,7 +149,7 @@
             "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-multi.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx-multi.json
similarity index 65%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-multi.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx-multi.json
index 5d2fa078f7..78cde14af8 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-cxx-multi.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx-multi.json
@@ -14,10 +14,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -29,7 +29,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -37,10 +37,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -56,10 +56,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -73,7 +73,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -84,10 +84,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -101,7 +101,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -109,10 +109,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -128,10 +128,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -149,7 +149,7 @@
             "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -167,10 +167,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -182,7 +182,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -190,10 +190,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -209,10 +209,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -226,7 +226,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -237,10 +237,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -254,7 +254,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -262,10 +262,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -281,10 +281,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -302,7 +302,7 @@
             "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_OTHER_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-config.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx.json
similarity index 65%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-config.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx.json
index 3815df5412..0253351a98 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-config.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-cxx.json
@@ -14,10 +14,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -29,7 +29,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -37,10 +37,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -56,10 +56,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -73,7 +73,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -84,10 +84,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -101,7 +101,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -109,10 +109,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -128,10 +128,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -149,7 +149,7 @@
             "importable": "PATH:<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all-multi.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-all-multi.json
similarity index 66%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all-multi.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-all-multi.json
index de16f8e2e6..cbb5d486fd 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all-multi.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-all-multi.json
@@ -12,8 +12,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -22,14 +22,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -40,8 +40,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -52,7 +52,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -68,8 +68,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -78,14 +78,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -96,8 +96,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -108,7 +108,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -127,11 +127,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -144,7 +144,7 @@
             "REGEX:<BMI_ONLY_FLAG>",
             "REGEX:PATH:<OUTPUT_FLAG>CMakeFiles/CXXModules__export_build_database@synth_<HEX>.dir<CONFIG_DIR>/",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -153,11 +153,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -174,11 +174,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -194,7 +194,7 @@
             "importable": "<IGNORE>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -213,11 +213,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -230,7 +230,7 @@
             "REGEX:<BMI_ONLY_FLAG>",
             "REGEX:PATH:<OUTPUT_FLAG>CMakeFiles/CXXModules__export_build_database@synth_<HEX>.dir<CONFIG_OTHER_DIR>/",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -239,11 +239,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -260,11 +260,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -280,7 +280,7 @@
             "importable": "<IGNORE>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-all.json
similarity index 66%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-all.json
index 0e510b8094..edcb25a44e 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-all.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-all.json
@@ -12,8 +12,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -22,14 +22,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -40,8 +40,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -52,7 +52,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -71,11 +71,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -88,7 +88,7 @@
             "REGEX:<BMI_ONLY_FLAG>",
             "REGEX:PATH:<OUTPUT_FLAG>CMakeFiles/CXXModules__export_build_database@synth_<HEX>.dir<CONFIG_DIR>/",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -97,11 +97,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -118,11 +118,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -138,7 +138,7 @@
             "importable": "<IGNORE>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-config.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-config.json
similarity index 66%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-config.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-config.json
index 0e510b8094..edcb25a44e 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-config.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-config.json
@@ -12,8 +12,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -22,14 +22,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -40,8 +40,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -52,7 +52,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -71,11 +71,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -88,7 +88,7 @@
             "REGEX:<BMI_ONLY_FLAG>",
             "REGEX:PATH:<OUTPUT_FLAG>CMakeFiles/CXXModules__export_build_database@synth_<HEX>.dir<CONFIG_DIR>/",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -97,11 +97,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -118,11 +118,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -138,7 +138,7 @@
             "importable": "<IGNORE>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx-config.json
similarity index 66%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx-config.json
index 0e510b8094..edcb25a44e 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx-config.json
@@ -12,8 +12,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -22,14 +22,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -40,8 +40,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -52,7 +52,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -71,11 +71,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -88,7 +88,7 @@
             "REGEX:<BMI_ONLY_FLAG>",
             "REGEX:PATH:<OUTPUT_FLAG>CMakeFiles/CXXModules__export_build_database@synth_<HEX>.dir<CONFIG_DIR>/",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -97,11 +97,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -118,11 +118,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -138,7 +138,7 @@
             "importable": "<IGNORE>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-multi.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx-multi.json
similarity index 66%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-multi.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx-multi.json
index de16f8e2e6..cbb5d486fd 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-multi.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx-multi.json
@@ -12,8 +12,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -22,14 +22,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -40,8 +40,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -52,7 +52,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -68,8 +68,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -78,14 +78,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_OTHER_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -96,8 +96,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -108,7 +108,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -127,11 +127,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -144,7 +144,7 @@
             "REGEX:<BMI_ONLY_FLAG>",
             "REGEX:PATH:<OUTPUT_FLAG>CMakeFiles/CXXModules__export_build_database@synth_<HEX>.dir<CONFIG_DIR>/",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -153,11 +153,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -174,11 +174,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -194,7 +194,7 @@
             "importable": "<IGNORE>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -213,11 +213,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -230,7 +230,7 @@
             "REGEX:<BMI_ONLY_FLAG>",
             "REGEX:PATH:<OUTPUT_FLAG>CMakeFiles/CXXModules__export_build_database@synth_<HEX>.dir<CONFIG_OTHER_DIR>/",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -239,11 +239,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -260,11 +260,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_OTHER_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -280,7 +280,7 @@
             "importable": "<IGNORE>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-config.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx.json
similarity index 66%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-config.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx.json
index 0e510b8094..edcb25a44e 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-cxx-config.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-cxx.json
@@ -12,8 +12,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -22,14 +22,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -40,8 +40,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -52,7 +52,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
@@ -71,11 +71,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -88,7 +88,7 @@
             "REGEX:<BMI_ONLY_FLAG>",
             "REGEX:PATH:<OUTPUT_FLAG>CMakeFiles/CXXModules__export_build_database@synth_<HEX>.dir<CONFIG_DIR>/",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -97,11 +97,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -118,11 +118,11 @@
             "-Dtarget_interface_define",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -138,7 +138,7 @@
             "importable": "<IGNORE>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-target.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-target.json
similarity index 72%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-target.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-target.json
index 1435edc414..1263ef0fe9 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-imported-target.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-imped-target.json
@@ -12,8 +12,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -22,14 +22,14 @@
             "PATH:-Ddepflag=\"CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/use_import_interfaces.dir<CONFIG_DIR>/use.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx"
+            "PATH:<SOURCE_DIR>/imp-mods/use.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -40,8 +40,8 @@
             "-D_MBCS",
             "-Dtarget_interface_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_interface_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -52,7 +52,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/import-modules/use.cxx",
+          "source": "PATH:<SOURCE_DIR>/imp-mods/use.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all.json b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-target.json
similarity index 65%
rename from Tests/RunCMake/CXXModules/examples/expect/export-build-database-all.json
rename to Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-target.json
index 4412d35b10..9b13bd0184 100644
--- a/Tests/RunCMake/CXXModules/examples/expect/export-build-database-all.json
+++ b/Tests/RunCMake/CXXModulesCompile/expect/exp-builddb-target.json
@@ -14,10 +14,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -29,7 +29,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/lib.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -37,10 +37,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -56,10 +56,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -73,7 +73,7 @@
           "private": true,
           "provides": {},
           "requires": ["importable"],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/lib.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/lib.cxx",
           "work-directory": "<BINARY_DIR>"
         },
         {
@@ -84,10 +84,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -101,7 +101,7 @@
             "PATH:-Ddepflag=\"CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>.d\"",
             "PATH:<OUTPUT_FLAG>CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable.cxx<OBJEXT>",
             "-c",
-            "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx"
+            "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx"
           ],
           "baseline-arguments": [
             "-D_MBCS",
@@ -109,10 +109,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -128,10 +128,10 @@
             "-Dfrom_compile_definitions",
             "-Dtarget_private_define",
             "-Dtarget_public_define",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/from_include_directories",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_private_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/target_public_include",
-            "PATH:-I<SOURCE_DIR>/examples/export-build-database/dep_interface_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/from_include_directories",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_private_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/target_public_include",
+            "PATH:-I<SOURCE_DIR>/exp-builddb/dep_interface_include",
             "-Dfrom_cmake_cxx_flags",
             "-Dfrom_cmake_cxx_<CONFIG_LOWER>_flags",
             "<CXX20_OPTION>",
@@ -149,7 +149,7 @@
             "importable": "<BINARY_DIR>/CMakeFiles/export_build_database.dir<CONFIG_DIR>/importable<BMIEXT>"
           },
           "requires": [],
-          "source": "PATH:<SOURCE_DIR>/examples/export-build-database/importable.cxx",
+          "source": "PATH:<SOURCE_DIR>/exp-builddb/importable.cxx",
           "work-directory": "<BINARY_DIR>"
         }
       ],
diff --git a/Tests/RunCMake/CXXModules/examples/export-build-database-setup.cmake b/Tests/RunCMake/CXXModulesCompile/export-build-database-setup.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/export-build-database-setup.cmake
rename to Tests/RunCMake/CXXModulesCompile/export-build-database-setup.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/file-sets-with-dot/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/file-sets-with-dot/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/file-sets-with-dot/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/file-sets-with-dot/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/file-sets-with-dot/importable.cxx b/Tests/RunCMake/CXXModulesCompile/file-sets-with-dot/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/file-sets-with-dot/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/file-sets-with-dot/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/file-sets-with-dot/main.cxx b/Tests/RunCMake/CXXModulesCompile/file-sets-with-dot/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/file-sets-with-dot/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/file-sets-with-dot/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/generated/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/generated/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/generated/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/generated/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/generated/importable.cxx.in b/Tests/RunCMake/CXXModulesCompile/generated/importable.cxx.in
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/generated/importable.cxx.in
rename to Tests/RunCMake/CXXModulesCompile/generated/importable.cxx.in
diff --git a/Tests/RunCMake/CXXModules/examples/generated/main.cxx b/Tests/RunCMake/CXXModulesCompile/generated/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/generated/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/generated/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-from-object/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-from-object/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-from-object/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-from-object/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-from-object/object-a.cxx b/Tests/RunCMake/CXXModulesCompile/imp-from-object/object-a.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-from-object/object-a.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-from-object/object-a.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-from-object/object-b.cxx b/Tests/RunCMake/CXXModulesCompile/imp-from-object/object-b.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-from-object/object-b.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-from-object/object-b.cxx
diff --git a/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-build-check.cmake b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-build-check.cmake
new file mode 100644
index 0000000000..9612fdb9bb
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-build-check.cmake
@@ -0,0 +1,18 @@
+include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
+set(item_filter "-ifcOnly")
+
+check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST)
+check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST)
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "build_database_Debug.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/Debug/CXX_build_database.json" NO_EXIST)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/Release/CXX_build_database.json" NO_EXIST)
+else ()
+  check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/CXX_build_database.json" NO_EXIST)
+endif ()
+
+string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-check.cmake b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-check.cmake
new file mode 100644
index 0000000000..9612fdb9bb
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-check.cmake
@@ -0,0 +1,18 @@
+include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
+set(item_filter "-ifcOnly")
+
+check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST)
+check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST)
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "build_database_Debug.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/Debug/CXX_build_database.json" NO_EXIST)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/Release/CXX_build_database.json" NO_EXIST)
+else ()
+  check_build_database("exp-builddb-imped" "CMakeFiles/export-module-commands.dir/CXX_build_database.json" NO_EXIST)
+endif ()
+
+string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-modules-export-build-database-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-stderr.txt
diff --git a/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database-check.cmake b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database-check.cmake
new file mode 100644
index 0000000000..518c20b90e
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database-check.cmake
@@ -0,0 +1,22 @@
+include("${CMAKE_CURRENT_LIST_DIR}/build-database-check.cmake")
+set(item_filter "-ifcOnly")
+
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb-imped" "build_database.json" ALL_MULTI)
+  check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX_MULTI)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
+  check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" CXX_AND_RELEASE)
+  check_build_database("exp-builddb-imped" "build_database_Release.json" JUST_RELEASE)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE)
+else ()
+  check_build_database("exp-builddb-imped" "build_database.json" ALL)
+  check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX)
+
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
+endif ()
+
+string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX-check.cmake b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX-check.cmake
new file mode 100644
index 0000000000..4cfe667ca1
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX-check.cmake
@@ -0,0 +1,22 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake")
+set(item_filter "-ifcOnly")
+
+check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST)
+
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX_MULTI)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
+  check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" CXX_AND_RELEASE)
+  check_build_database("exp-builddb-imped" "build_database_Release.json" JUST_RELEASE)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE)
+else ()
+  check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX)
+
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
+endif ()
+
+string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake
new file mode 100644
index 0000000000..05e542fa42
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX/Debug-check.cmake
@@ -0,0 +1,19 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake")
+set(item_filter "-ifcOnly")
+
+check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST)
+check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST)
+
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
+  check_build_database("exp-builddb-imped" "build_database_Debug.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" NO_EXIST)
+else ()
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
+endif ()
+
+string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake
new file mode 100644
index 0000000000..5ff723c833
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/CXX/Release-Release-check.cmake
@@ -0,0 +1,19 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../../build-database-check.cmake")
+set(item_filter "-ifcOnly")
+
+check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST)
+check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST)
+
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
+  check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" CXX_AND_RELEASE)
+  check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE)
+else ()
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
+endif ()
+
+string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/Debug-check.cmake b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/Debug-check.cmake
new file mode 100644
index 0000000000..7a7598e802
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/Debug-check.cmake
@@ -0,0 +1,19 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake")
+set(item_filter "-ifcOnly")
+
+check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST)
+check_build_database("exp-builddb-imped" "build_database_CXX.json" NO_EXIST)
+
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
+  check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "build_database_Release.json" NO_EXIST)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" NO_EXIST)
+else ()
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
+endif ()
+
+string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/Release-check.cmake b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/Release-check.cmake
new file mode 100644
index 0000000000..1ea6a23422
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/imp-mods-exp-builddb-target-cmake_build_database/Release-check.cmake
@@ -0,0 +1,19 @@
+include("${CMAKE_CURRENT_LIST_DIR}/../build-database-check.cmake")
+set(item_filter "-ifcOnly")
+
+check_build_database("exp-builddb-imped" "build_database.json" NO_EXIST)
+check_build_database("exp-builddb-imped" "build_database_CXX.json" JUST_CXX)
+
+if (RunCMake_GENERATOR_IS_MULTI_CONFIG)
+  check_build_database("exp-builddb-imped" "build_database_CXX_Debug.json" CXX_AND_DEBUG)
+  check_build_database("exp-builddb-imped" "build_database_Debug.json" JUST_DEBUG)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Debug/CXX_build_database.json" JUST_TARGET_DEBUG)
+
+  check_build_database("exp-builddb-imped" "build_database_CXX_Release.json" CXX_AND_RELEASE)
+  check_build_database("exp-builddb-imped" "build_database_Release.json" JUST_RELEASE)
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/Release/CXX_build_database.json" JUST_TARGET_RELEASE)
+else ()
+  check_build_database("exp-builddb-imped" "CMakeFiles/use_import_interfaces.dir/CXX_build_database.json" JUST_TARGET)
+endif ()
+
+string(REPLACE ";" "\n  " RunCMake_TEST_FAILED "${RunCMake_TEST_FAILED}")
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-mods/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-modules/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-mods/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-modules/use.cxx b/Tests/RunCMake/CXXModulesCompile/imp-mods/use.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-modules/use.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-mods/use.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build-stderr.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/impl-uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/impl-uses-std.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/impl-uses-std.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/impl-uses-std.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/main.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/uses-std.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-build/uses-std.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-build/uses-std.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install-stderr.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/impl-uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/impl-uses-std.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/impl-uses-std.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/impl-uses-std.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/main.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/uses-std.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-export-no-std-install/uses-std.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-exp-no-std-install/uses-std.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-no-std-property-build-result.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop-build-result.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-no-std-property-build-result.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop-build-result.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-no-std-property-build-stdout.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop-build-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-no-std-property-build-stdout.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop-build-stdout.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-no-std-property-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-no-std-property-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop-stderr.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-no-std-property/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-no-std-property/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-no-std-property/main.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-no-std-property/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-no-std-prop/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build-stderr.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/main.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build/uses-std.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-build/uses-std.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-build/uses-std.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install-stderr.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/main.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/test/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install/test/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/test/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install/test/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/uses-std.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install/uses-std.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-not-in-export-install/uses-std.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-not-in-exp-install/uses-std.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-stderr.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-transitive-not-in-export-build-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-trans-not-in-exp-build-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-transitive-not-in-export-build-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-trans-not-in-exp-build-stderr.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-transitive-not-in-export-install-stderr.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-trans-not-in-exp-install-stderr.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-transitive-not-in-export-install-stderr.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-trans-not-in-exp-install-stderr.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-transitive/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std-trans/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-transitive/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std-trans/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std-transitive/main.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std-trans/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std-transitive/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std-trans/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/import-std/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/imp-std/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/imp-std/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/import-std/main.cxx b/Tests/RunCMake/CXXModulesCompile/imp-std/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/import-std/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/imp-std/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/install-bmi-and-interfaces/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/install-bmi-and-ifaces/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/install-bmi-and-interfaces/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/install-bmi-and-ifaces/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/install-bmi-and-interfaces/check-for-bmi.cmake b/Tests/RunCMake/CXXModulesCompile/install-bmi-and-ifaces/check-for-bmi.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/install-bmi-and-interfaces/check-for-bmi.cmake
rename to Tests/RunCMake/CXXModulesCompile/install-bmi-and-ifaces/check-for-bmi.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/install-bmi-and-interfaces/importable.cxx b/Tests/RunCMake/CXXModulesCompile/install-bmi-and-ifaces/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/install-bmi-and-interfaces/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/install-bmi-and-ifaces/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/install-bmi/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/install-bmi/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/install-bmi/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/install-bmi/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/install-bmi/check-for-bmi.cmake b/Tests/RunCMake/CXXModulesCompile/install-bmi/check-for-bmi.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/install-bmi/check-for-bmi.cmake
rename to Tests/RunCMake/CXXModulesCompile/install-bmi/check-for-bmi.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/install-bmi/importable.cxx b/Tests/RunCMake/CXXModulesCompile/install-bmi/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/install-bmi/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/install-bmi/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/internal-partitions/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/internal-partitions/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/internal-partitions/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/internal-partitions/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/internal-partitions/importable.cxx b/Tests/RunCMake/CXXModulesCompile/internal-partitions/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/internal-partitions/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/internal-partitions/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/internal-partitions/internal.cxx b/Tests/RunCMake/CXXModulesCompile/internal-partitions/internal.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/internal-partitions/internal.cxx
rename to Tests/RunCMake/CXXModulesCompile/internal-partitions/internal.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/internal-partitions/main.cxx b/Tests/RunCMake/CXXModulesCompile/internal-partitions/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/internal-partitions/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/internal-partitions/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/internal-partitions/partition.cxx b/Tests/RunCMake/CXXModulesCompile/internal-partitions/partition.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/internal-partitions/partition.cxx
rename to Tests/RunCMake/CXXModulesCompile/internal-partitions/partition.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/library/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/library/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/library/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/library/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/library/importable.cxx b/Tests/RunCMake/CXXModulesCompile/library/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/library/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/library/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/library/main.cxx b/Tests/RunCMake/CXXModulesCompile/library/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/library/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/library/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/ninja-cmp0154-build-check.cmake b/Tests/RunCMake/CXXModulesCompile/ninja-cmp0154-build-check.cmake
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/ninja-cmp0154-build-check.cmake
rename to Tests/RunCMake/CXXModulesCompile/ninja-cmp0154-build-check.cmake
diff --git a/Tests/RunCMake/CXXModules/examples/ninja-cmp0154/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/ninja-cmp0154/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/ninja-cmp0154/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/ninja-cmp0154/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/ninja-cmp0154/importable.cxx.in b/Tests/RunCMake/CXXModulesCompile/ninja-cmp0154/importable.cxx.in
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/ninja-cmp0154/importable.cxx.in
rename to Tests/RunCMake/CXXModulesCompile/ninja-cmp0154/importable.cxx.in
diff --git a/Tests/RunCMake/CXXModules/examples/ninja-cmp0154/main.cxx b/Tests/RunCMake/CXXModulesCompile/ninja-cmp0154/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/ninja-cmp0154/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/ninja-cmp0154/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/ninja-cmp0154/unrelated.cxx b/Tests/RunCMake/CXXModulesCompile/ninja-cmp0154/unrelated.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/ninja-cmp0154/unrelated.cxx
rename to Tests/RunCMake/CXXModulesCompile/ninja-cmp0154/unrelated.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order-randomized/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order-randomized/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order-randomized/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order-randomized/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/main.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod1.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod1.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod1.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod1.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod2.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod2.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod2.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod2.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod3.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod3.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod3.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod3.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod4.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod4.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod4.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod4.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod5.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod5.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod5.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod5.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod6.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod6.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod6.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod6.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod7.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod7.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/module_level/mod7.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod7.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl-non-partition.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl-non-partition.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl-non-partition.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl-non-partition.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl1.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl1.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl1.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl1.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl2.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl2.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl2.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl2.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl3.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl3.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl3.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl3.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl4.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl4.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl4.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl4.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl5.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl5.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl5.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl5.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl6.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl6.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl6.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl6.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl7.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl7.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/impl7.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl7.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf1.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf1.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf1.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf1.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf2.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf2.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf2.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf2.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf3.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf3.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf3.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf3.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf4.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf4.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf4.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf4.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf5.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf5.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf5.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf5.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf6.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf6.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf6.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf6.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf7.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf7.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/intf7.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf7.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/partition_level.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/partition_level.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/partition_level/partition_level.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/partition_level.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target1.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target1.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target1.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target1.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target2.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target2.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target2.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target2.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target3.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target3.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target3.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target3.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target4.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target4.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target4.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target4.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target5.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target5.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target5.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target5.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target6.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target6.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target6.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target6.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target7.cxx b/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target7.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/non-trivial-collation-order/target_level/target7.cxx
rename to Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target7.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/object-library/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/object-library/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/object-library/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/object-library/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/object-library/importable.cxx b/Tests/RunCMake/CXXModulesCompile/object-library/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/object-library/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/object-library/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/object-library/main.cxx b/Tests/RunCMake/CXXModulesCompile/object-library/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/object-library/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/object-library/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/partitions/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/partitions/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/partitions/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/partitions/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/partitions/importable.cxx b/Tests/RunCMake/CXXModulesCompile/partitions/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/partitions/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/partitions/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/partitions/main.cxx b/Tests/RunCMake/CXXModulesCompile/partitions/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/partitions/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/partitions/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/partitions/partition.cxx b/Tests/RunCMake/CXXModulesCompile/partitions/partition.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/partitions/partition.cxx
rename to Tests/RunCMake/CXXModulesCompile/partitions/partition.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/public-req-private-build-result.txt b/Tests/RunCMake/CXXModulesCompile/public-req-priv-build-result.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/public-req-private-build-result.txt
rename to Tests/RunCMake/CXXModulesCompile/public-req-priv-build-result.txt
diff --git a/Tests/RunCMake/CXXModulesCompile/public-req-priv-build-stdout.txt b/Tests/RunCMake/CXXModulesCompile/public-req-priv-build-stdout.txt
new file mode 100644
index 0000000000..5df83a5d64
--- /dev/null
+++ b/Tests/RunCMake/CXXModulesCompile/public-req-priv-build-stdout.txt
@@ -0,0 +1 @@
+CMake Error: Public C\+\+ module source `.*/Tests/RunCMake/CXXModulesCompile/public-req-priv/pub\.cxx` requires the `priv` C\+\+ module which is provided by a private source
diff --git a/Tests/RunCMake/CXXModules/examples/public-req-private/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/public-req-priv/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/public-req-private/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/public-req-priv/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/public-req-private/priv.cxx b/Tests/RunCMake/CXXModulesCompile/public-req-priv/priv.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/public-req-private/priv.cxx
rename to Tests/RunCMake/CXXModulesCompile/public-req-priv/priv.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/public-req-private/pub.cxx b/Tests/RunCMake/CXXModulesCompile/public-req-priv/pub.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/public-req-private/pub.cxx
rename to Tests/RunCMake/CXXModulesCompile/public-req-priv/pub.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/req-private-other-target-build-result.txt b/Tests/RunCMake/CXXModulesCompile/req-priv-other-target-build-result.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/req-private-other-target-build-result.txt
rename to Tests/RunCMake/CXXModulesCompile/req-priv-other-target-build-result.txt
diff --git a/Tests/RunCMake/CXXModules/examples/req-private-other-target-build-stdout.txt b/Tests/RunCMake/CXXModulesCompile/req-priv-other-target-build-stdout.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/req-private-other-target-build-stdout.txt
rename to Tests/RunCMake/CXXModulesCompile/req-priv-other-target-build-stdout.txt
diff --git a/Tests/RunCMake/CXXModules/examples/req-private-other-target/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/req-priv-other-target/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/req-private-other-target/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/req-priv-other-target/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/req-private-other-target/lib.cxx b/Tests/RunCMake/CXXModulesCompile/req-priv-other-target/lib.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/req-private-other-target/lib.cxx
rename to Tests/RunCMake/CXXModulesCompile/req-priv-other-target/lib.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/req-private-other-target/main.cxx b/Tests/RunCMake/CXXModulesCompile/req-priv-other-target/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/req-private-other-target/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/req-priv-other-target/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/req-private-other-target/priv.cxx b/Tests/RunCMake/CXXModulesCompile/req-priv-other-target/priv.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/req-private-other-target/priv.cxx
rename to Tests/RunCMake/CXXModulesCompile/req-priv-other-target/priv.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/same-src-name/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/same-src-name/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/same-src-name/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/same-src-name/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/same-src-name/a/same.cxx b/Tests/RunCMake/CXXModulesCompile/same-src-name/a/same.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/same-src-name/a/same.cxx
rename to Tests/RunCMake/CXXModulesCompile/same-src-name/a/same.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/same-src-name/b/same.cxx b/Tests/RunCMake/CXXModulesCompile/same-src-name/b/same.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/same-src-name/b/same.cxx
rename to Tests/RunCMake/CXXModulesCompile/same-src-name/b/same.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/same-src-name/main.cxx b/Tests/RunCMake/CXXModulesCompile/same-src-name/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/same-src-name/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/same-src-name/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/scan-with-pch/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/scan-with-pch/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan-with-pch/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/scan-with-pch/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/scan-with-pch/main.cxx b/Tests/RunCMake/CXXModulesCompile/scan-with-pch/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan-with-pch/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/scan-with-pch/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/scan-with-pch/pch.h b/Tests/RunCMake/CXXModulesCompile/scan-with-pch/pch.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan-with-pch/pch.h
rename to Tests/RunCMake/CXXModulesCompile/scan-with-pch/pch.h
diff --git a/Tests/RunCMake/CXXModules/examples/scan_properties/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/scan_props/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan_properties/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/scan_props/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/scan_properties/always_scan.cxx b/Tests/RunCMake/CXXModulesCompile/scan_props/always_scan.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan_properties/always_scan.cxx
rename to Tests/RunCMake/CXXModulesCompile/scan_props/always_scan.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/scan_properties/join.cxx b/Tests/RunCMake/CXXModulesCompile/scan_props/join.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan_properties/join.cxx
rename to Tests/RunCMake/CXXModulesCompile/scan_props/join.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/scan_properties/main.cxx b/Tests/RunCMake/CXXModulesCompile/scan_props/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan_properties/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/scan_props/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/scan_properties/module.cxx b/Tests/RunCMake/CXXModulesCompile/scan_props/module.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan_properties/module.cxx
rename to Tests/RunCMake/CXXModulesCompile/scan_props/module.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/scan_properties/never_scan.ixx b/Tests/RunCMake/CXXModulesCompile/scan_props/never_scan.ixx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/scan_properties/never_scan.ixx
rename to Tests/RunCMake/CXXModulesCompile/scan_props/never_scan.ixx
diff --git a/Tests/RunCMake/CXXModules/examples/simple/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/simple/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/simple/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/simple/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/simple/importable.cxx b/Tests/RunCMake/CXXModulesCompile/simple/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/simple/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/simple/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/simple/main.cxx b/Tests/RunCMake/CXXModulesCompile/simple/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/simple/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/simple/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/target-objects/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/target-objects/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/target-objects/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/target-objects/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/target-objects/importable.cxx b/Tests/RunCMake/CXXModulesCompile/target-objects/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/target-objects/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/target-objects/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/target-objects/main.cxx b/Tests/RunCMake/CXXModulesCompile/target-objects/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/target-objects/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/target-objects/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/try-compile/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/try-compile/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/try-compile/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/try-compile/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/try-compile/importable.cxx b/Tests/RunCMake/CXXModulesCompile/try-compile/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/try-compile/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/try-compile/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/try-compile/use_importable.cxx b/Tests/RunCMake/CXXModulesCompile/try-compile/use_importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/try-compile/use_importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/try-compile/use_importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/try-run/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/try-run/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/try-run/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/try-run/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/try-run/importable.cxx b/Tests/RunCMake/CXXModulesCompile/try-run/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/try-run/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/try-run/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/try-run/main.cxx b/Tests/RunCMake/CXXModulesCompile/try-run/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/try-run/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/try-run/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/unity-build/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/unity-build/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/unity-build/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/unity-build/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/unity-build/importable.cxx b/Tests/RunCMake/CXXModulesCompile/unity-build/importable.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/unity-build/importable.cxx
rename to Tests/RunCMake/CXXModulesCompile/unity-build/importable.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/unity-build/main.cxx b/Tests/RunCMake/CXXModulesCompile/unity-build/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/unity-build/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/unity-build/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/unity-build/unity.h b/Tests/RunCMake/CXXModulesCompile/unity-build/unity.h
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/unity-build/unity.h
rename to Tests/RunCMake/CXXModulesCompile/unity-build/unity.h
diff --git a/Tests/RunCMake/CXXModules/examples/unity-build/unity1.cxx b/Tests/RunCMake/CXXModulesCompile/unity-build/unity1.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/unity-build/unity1.cxx
rename to Tests/RunCMake/CXXModulesCompile/unity-build/unity1.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/unity-build/unity2.cxx b/Tests/RunCMake/CXXModulesCompile/unity-build/unity2.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/unity-build/unity2.cxx
rename to Tests/RunCMake/CXXModulesCompile/unity-build/unity2.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/vs-without-flags/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/vs-without-flags/CMakeLists.txt
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/vs-without-flags/CMakeLists.txt
rename to Tests/RunCMake/CXXModulesCompile/vs-without-flags/CMakeLists.txt
diff --git a/Tests/RunCMake/CXXModules/examples/vs-without-flags/main.cxx b/Tests/RunCMake/CXXModulesCompile/vs-without-flags/main.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/vs-without-flags/main.cxx
rename to Tests/RunCMake/CXXModulesCompile/vs-without-flags/main.cxx
diff --git a/Tests/RunCMake/CXXModules/examples/vs-without-flags/module.cxx b/Tests/RunCMake/CXXModulesCompile/vs-without-flags/module.cxx
similarity index 100%
rename from Tests/RunCMake/CXXModules/examples/vs-without-flags/module.cxx
rename to Tests/RunCMake/CXXModulesCompile/vs-without-flags/module.cxx