diff --git a/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake b/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake index d8d52efc97..695cbf74ab 100644 --- a/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake +++ b/Tests/RunCMake/CXXModulesCompile/RunCMakeTest.cmake @@ -197,8 +197,8 @@ if ("named" IN_LIST CMake_TEST_MODULE_COMPILATION) 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(non-triv-coll) + run_cxx_module_test(non-triv-coll-rando) run_cxx_module_test(duplicate) set(RunCMake_CXXModules_NO_TEST 1) run_cxx_module_test(imp-from-object) diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order-randomized/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/non-triv-coll-rando/CMakeLists.txt similarity index 58% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order-randomized/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll-rando/CMakeLists.txt index 4e1e7af1ee..68fe131d4d 100644 --- a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order-randomized/CMakeLists.txt +++ b/Tests/RunCMake/CXXModulesCompile/non-triv-coll-rando/CMakeLists.txt @@ -5,5 +5,5 @@ include("${CMAKE_SOURCE_DIR}/../cxx-modules-rules.cmake") set(non_trivial_collation_order_randomized TRUE) -add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../non-trivial-collation-order/" - "${CMAKE_CURRENT_BINARY_DIR}/non-trivial-collation-order") +add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../non-triv-coll/" + "${CMAKE_CURRENT_BINARY_DIR}/non-triv-coll") diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/CMakeLists.txt b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/CMakeLists.txt similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/CMakeLists.txt rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/CMakeLists.txt diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/main.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/main.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/main.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/main.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod1.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod1.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod1.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod1.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod2.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod2.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod2.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod2.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod3.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod3.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod3.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod3.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod4.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod4.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod4.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod4.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod5.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod5.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod5.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod5.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod6.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod6.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod6.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod6.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod7.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod7.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/module_level/mod7.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/module_level/mod7.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl-non-partition.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl-non-partition.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl-non-partition.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl-non-partition.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl1.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl1.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl1.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl1.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl2.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl2.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl2.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl2.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl3.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl3.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl3.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl3.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl4.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl4.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl4.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl4.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl5.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl5.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl5.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl5.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl6.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl6.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl6.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl6.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl7.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl7.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/impl7.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/impl7.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf1.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf1.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf1.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf1.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf2.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf2.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf2.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf2.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf3.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf3.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf3.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf3.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf4.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf4.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf4.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf4.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf5.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf5.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf5.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf5.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf6.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf6.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf6.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf6.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf7.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf7.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/intf7.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/intf7.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/partition_level.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/partition_level.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/partition_level/partition_level.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/partition_level/partition_level.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target1.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target1.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target1.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target1.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target2.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target2.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target2.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target2.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target3.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target3.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target3.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target3.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target4.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target4.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target4.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target4.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target5.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target5.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target5.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target5.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target6.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target6.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target6.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target6.cxx diff --git a/Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target7.cxx b/Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target7.cxx similarity index 100% rename from Tests/RunCMake/CXXModulesCompile/non-trivial-collation-order/target_level/target7.cxx rename to Tests/RunCMake/CXXModulesCompile/non-triv-coll/target_level/target7.cxx