Tests/CXXModulesCompile: rename examples to be shorter

Perform the following renames on the example directory names to avoid
long paths:

- `build-database` → `builddb`
- `export` → `exp`
- `import` → `imp`
- `include-directories` → `incdirs`
- `interface` → `iface`
- `module` → `mod`
- `private` → `priv`
- `property` → `prop`
- `properties` → `props`
- `transitive` → `trans`

Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake

@@ -84,7 +84,7 @@ function (run_cxx_module_test directory)
   else ()
     set(RunCMake_TEST_OPTIONS -DCMAKE_BUILD_TYPE=Debug)
   endif ()
-  if (directory MATCHES "import-std")
+  if (directory MATCHES "imp-std")
     list(APPEND RunCMake_TEST_OPTIONS
       ${stdlib_custom_json})
   endif ()
@@ -168,44 +168,44 @@ if ("named" IN_LIST CMake_TEST_MODULE_COMPILATION)
   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(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_properties)
+  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(import-std)
+    run_cxx_module_test(imp-std)
     set(RunCMake_CXXModules_NO_TEST 1)
-    run_cxx_module_test(import-std-no-std-property)
+    run_cxx_module_test(imp-std-no-std-prop)
     unset(RunCMake_CXXModules_NO_TEST)
-    run_cxx_module_test(import-std-export-no-std-build)
+    run_cxx_module_test(imp-std-exp-no-std-build)
     set(RunCMake_CXXModules_INSTALL 1)
-    run_cxx_module_test(import-std-export-no-std-install)
+    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(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")
+      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}/examples/imp-std-not-in-exp-build-build")
 
       set(RunCMake_CXXModules_INSTALL 1)
-      run_cxx_module_test(import-std-not-in-export-install)
+      run_cxx_module_test(imp-std-not-in-exp-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(imp-std-trans imp-std-trans-not-in-exp-install "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/imp-std-not-in-exp-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)
+      run_cxx_module_test(imp-std-trans imp-std-trans-exp-no-std-build "-DCMAKE_PREFIX_PATH=${RunCMake_BINARY_DIR}/examples/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}/examples/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(export-compile-commands)
+  run_cxx_module_test(exp-compile-commands)
 endif ()
 
 macro (setup_export_build_database_targets)
@@ -228,7 +228,7 @@ 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)
+  run_cxx_module_test(exp-builddb)
 
   unset(RunCMake_CXXModules_NO_TEST)
   unset(RunCMake_CXXModules_TARGETS)
@@ -237,12 +237,12 @@ 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)
+  run_cxx_module_test(public-req-priv)
   set(RunCMake_CXXModules_NO_TEST 1)
-  run_cxx_module_test(req-private-other-target)
+  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-modules-json-file)
+  run_cxx_module_test_rebuild(depchain-mods-json-file)
   if (RunCMake_GENERATOR MATCHES "Ninja")
     run_cxx_module_test_rebuild(depchain-collation-restat)
   endif ()
@@ -271,38 +271,38 @@ function (run_cxx_module_import_test type name)
     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})
+  run_cxx_module_test(imp-mods "imp-mods-${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)
+  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}/examples/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 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)
+    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 export-build-database -DBUILD_DATABASE=1 EXPORT_BUILD_DATABASE)
+      run_cxx_module_import_test(build exp-builddb -DBUILD_DATABASE=1 EXPORT_BUILD_DATABASE)
 
       unset(RunCMake_CXXModules_TARGETS)
     endif ()
@@ -315,31 +315,31 @@ 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)
+  run_cxx_module_test(install-bmi-and-ifaces)
 
   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)
+    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}/examples/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 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)
+      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 ()
@@ -367,6 +367,6 @@ 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)
+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}/examples/exp-${test_set}-ninja-install" -DFROM_NINJA=1)

Tests/RunCMake/CXXModulesCompile/examples/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}")

Tests/RunCMake/CXXModulesCompile/examples/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}")