diff --git a/libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_nontrivial.pass.cpp b/libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_nontrivial.pass.cpp --- a/libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_nontrivial.pass.cpp +++ b/libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_nontrivial.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17 // In the modules build, adding another overload of `memmove` doesn't work. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // GCC complains about "ambiguating" `__builtin_memmove`. // UNSUPPORTED: gcc diff --git a/libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_trivial.pass.cpp b/libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_trivial.pass.cpp --- a/libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_trivial.pass.cpp +++ b/libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_trivial.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17 // In the modules build, adding another overload of `memmove` doesn't work. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // GCC complains about "ambiguating" `__builtin_memmove`. // UNSUPPORTED: gcc diff --git a/libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp b/libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp --- a/libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp +++ b/libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp @@ -10,7 +10,7 @@ // UNSUPPORTED: libcpp-has-no-incomplete-pstl // Having a customization point outside the module doesn't work, so this test is inherintly module-hostile. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Make sure that the customization points get called properly when overloaded diff --git a/libcxx/test/libcxx/assertions/customize_verbose_abort.compile-time.pass.cpp b/libcxx/test/libcxx/assertions/customize_verbose_abort.compile-time.pass.cpp --- a/libcxx/test/libcxx/assertions/customize_verbose_abort.compile-time.pass.cpp +++ b/libcxx/test/libcxx/assertions/customize_verbose_abort.compile-time.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // This compile-time customization requires cross-file macros, which doesn't work with modules. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Make sure that we can customize the verbose termination function at compile-time by // defining _LIBCPP_VERBOSE_ABORT ourselves. Note that this does not have any diff --git a/libcxx/test/libcxx/assertions/modes/debug_mode_not_1_or_0.verify.cpp b/libcxx/test/libcxx/assertions/modes/debug_mode_not_1_or_0.verify.cpp --- a/libcxx/test/libcxx/assertions/modes/debug_mode_not_1_or_0.verify.cpp +++ b/libcxx/test/libcxx/assertions/modes/debug_mode_not_1_or_0.verify.cpp @@ -11,7 +11,7 @@ // Hardened mode would additionally trigger the error that hardened and debug modes are mutually exclusive. // UNSUPPORTED: libcpp-hardening-mode=hardened // Modules build produces a different error ("Could not build module 'std'"). -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // ADDITIONAL_COMPILE_FLAGS: -Wno-macro-redefined -D_LIBCPP_ENABLE_DEBUG_MODE=2 #include diff --git a/libcxx/test/libcxx/assertions/modes/hardened_and_debug_mutually_exclusive.verify.cpp b/libcxx/test/libcxx/assertions/modes/hardened_and_debug_mutually_exclusive.verify.cpp --- a/libcxx/test/libcxx/assertions/modes/hardened_and_debug_mutually_exclusive.verify.cpp +++ b/libcxx/test/libcxx/assertions/modes/hardened_and_debug_mutually_exclusive.verify.cpp @@ -9,7 +9,7 @@ // This test verifies that `_LIBCPP_ENABLE_HARDENED_MODE` and `_LIBCPP_ENABLE_DEBUG_MODE` are mutually exclusive. // Modules build produces a different error ("Could not build module 'std'"). -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // ADDITIONAL_COMPILE_FLAGS: -Wno-macro-redefined -D_LIBCPP_ENABLE_HARDENED_MODE=1 -D_LIBCPP_ENABLE_DEBUG_MODE=1 #include diff --git a/libcxx/test/libcxx/assertions/modes/hardened_mode_not_1_or_0.verify.cpp b/libcxx/test/libcxx/assertions/modes/hardened_mode_not_1_or_0.verify.cpp --- a/libcxx/test/libcxx/assertions/modes/hardened_mode_not_1_or_0.verify.cpp +++ b/libcxx/test/libcxx/assertions/modes/hardened_mode_not_1_or_0.verify.cpp @@ -11,7 +11,7 @@ // Debug mode would additionally trigger the error that hardened and debug modes are mutually exclusive. // UNSUPPORTED: libcpp-hardening-mode=debug // Modules build produces a different error ("Could not build module 'std'"). -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // ADDITIONAL_COMPILE_FLAGS: -Wno-macro-redefined -D_LIBCPP_ENABLE_HARDENED_MODE=2 #include diff --git a/libcxx/test/libcxx/clang_modules_include.gen.py b/libcxx/test/libcxx/clang_modules_include.gen.py --- a/libcxx/test/libcxx/clang_modules_include.gen.py +++ b/libcxx/test/libcxx/clang_modules_include.gen.py @@ -44,14 +44,14 @@ #include <{header}> """) -# TODO: Remove the UNSUPPORTED{BLOCKLIT}: modules-build once issues with this test have been figured out. +# TODO: Remove the UNSUPPORTED{BLOCKLIT}: clang-modules-build once issues with this test have been figured out. print(f"""\ //--- __std_clang_module.compile.pass.mm -// UNSUPPORTED{BLOCKLIT}: modules-build +// UNSUPPORTED{BLOCKLIT}: clang-modules-build // RUN{BLOCKLIT}: %{{cxx}} %s %{{flags}} %{{compile_flags}} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -// REQUIRES{BLOCKLIT}: modules-build +// REQUIRES{BLOCKLIT}: clang-modules-build // GCC doesn't support -fcxx-modules // UNSUPPORTED{BLOCKLIT}: gcc diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp b/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp --- a/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp +++ b/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Prevent from generating deprecated warnings for this test. // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp b/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp --- a/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp +++ b/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Poison the std:: names we might use inside __gnu_cxx to ensure they're // properly qualified. diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp b/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp --- a/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp +++ b/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Prevent from generating deprecated warnings for this test. // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp b/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp --- a/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp +++ b/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Poison the std:: names we might use inside __gnu_cxx to ensure they're // properly qualified. diff --git a/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp b/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp --- a/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp +++ b/libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp @@ -8,7 +8,7 @@ // When building with modules, including headers inside extern "C" is an anti-pattern // that we don't want to support and can't support with LSV enabled. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Sometimes C++'s headers get included within extern "C" contexts. This // is ill-formed (no diagnostic required), per [using.headers]p3, but we permit diff --git a/libcxx/test/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp b/libcxx/test/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp --- a/libcxx/test/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp +++ b/libcxx/test/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // This test breaks when enabling LSV. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Test that limits macros are available when is included // with or without macro _XOPEN_SOURCE=700. diff --git a/libcxx/test/libcxx/extensions/hash/specializations.pass.cpp b/libcxx/test/libcxx/extensions/hash/specializations.pass.cpp --- a/libcxx/test/libcxx/extensions/hash/specializations.pass.cpp +++ b/libcxx/test/libcxx/extensions/hash/specializations.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // Prevent from generating deprecated warnings for this test. // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated diff --git a/libcxx/test/libcxx/include_as_c.sh.cpp b/libcxx/test/libcxx/include_as_c.sh.cpp --- a/libcxx/test/libcxx/include_as_c.sh.cpp +++ b/libcxx/test/libcxx/include_as_c.sh.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // We're building as C, so this test doesn't work when building with modules. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // GCC complains about unrecognized arguments because we're compiling the // file as C, but we're passing C++ flags on the command-line. diff --git a/libcxx/test/libcxx/input.output/iostream.format/print.fun/vprint_unicode_windows.pass.cpp b/libcxx/test/libcxx/input.output/iostream.format/print.fun/vprint_unicode_windows.pass.cpp --- a/libcxx/test/libcxx/input.output/iostream.format/print.fun/vprint_unicode_windows.pass.cpp +++ b/libcxx/test/libcxx/input.output/iostream.format/print.fun/vprint_unicode_windows.pass.cpp @@ -11,7 +11,7 @@ // UNSUPPORTED: GCC-ALWAYS_INLINE-FIXME // Clang modules do not work with the definiton of _LIBCPP_TESTING_PRINT_WRITE_TO_WINDOWS_CONSOLE_FUNCTION -// XFAIL: modules-build +// XFAIL: clang-modules-build // XFAIL: availability-fp_to_chars-missing diff --git a/libcxx/test/libcxx/language.support/support.c.headers/support.c.headers.other/math.lerp.verify.cpp b/libcxx/test/libcxx/language.support/support.c.headers/support.c.headers.other/math.lerp.verify.cpp --- a/libcxx/test/libcxx/language.support/support.c.headers/support.c.headers.other/math.lerp.verify.cpp +++ b/libcxx/test/libcxx/language.support/support.c.headers/support.c.headers.other/math.lerp.verify.cpp @@ -10,7 +10,7 @@ // declaration of 'lerp' must be imported from module 'std.compat.cmath' // before it is required // therefore disable the test in this configuration. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // diff --git a/libcxx/test/libcxx/language.support/timespec_get.xopen.compile.pass.cpp b/libcxx/test/libcxx/language.support/timespec_get.xopen.compile.pass.cpp --- a/libcxx/test/libcxx/language.support/timespec_get.xopen.compile.pass.cpp +++ b/libcxx/test/libcxx/language.support/timespec_get.xopen.compile.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // This test breaks when enabling LSV. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // UNSUPPORTED: c++03, c++11, c++14 diff --git a/libcxx/test/libcxx/module_std.gen.py b/libcxx/test/libcxx/module_std.gen.py --- a/libcxx/test/libcxx/module_std.gen.py +++ b/libcxx/test/libcxx/module_std.gen.py @@ -119,7 +119,7 @@ //--- module_std.sh.cpp // UNSUPPORTED{BLOCKLIT}: c++03, c++11, c++14, c++17 // UNSUPPORTED{BLOCKLIT}: libcpp-has-no-std-modules -// UNSUPPORTED{BLOCKLIT}: modules-build +// UNSUPPORTED{BLOCKLIT}: clang-modules-build // REQUIRES{BLOCKLIT}: has-clang-tidy diff --git a/libcxx/test/libcxx/transitive_includes.gen.py b/libcxx/test/libcxx/transitive_includes.gen.py --- a/libcxx/test/libcxx/transitive_includes.gen.py +++ b/libcxx/test/libcxx/transitive_includes.gen.py @@ -68,7 +68,7 @@ // When built with modules, this test doesn't work because --trace-includes doesn't // report the stack of includes correctly. -// UNSUPPORTED{BLOCKLIT}: modules-build +// UNSUPPORTED{BLOCKLIT}: clang-modules-build // This test uses --trace-includes, which is not supported by GCC. // UNSUPPORTED{BLOCKLIT}: gcc diff --git a/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp b/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp --- a/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp +++ b/libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp @@ -8,7 +8,7 @@ // The test suite needs to define the ABI macros on the command line when // modules are enabled. -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // diff --git a/libcxx/test/lit.local.cfg b/libcxx/test/lit.local.cfg --- a/libcxx/test/lit.local.cfg +++ b/libcxx/test/lit.local.cfg @@ -42,7 +42,7 @@ if ( std and not "libcpp-has-no-std-modules" in config.available_features - and not "modules-build" in config.available_features + and not "clang-modules-build" in config.available_features ): build = os.path.join(config.test_exec_root, "__config_module__") config.substitutions = appendToSubstitution( diff --git a/libcxx/test/std/modules/std.pass.cpp b/libcxx/test/std/modules/std.pass.cpp --- a/libcxx/test/std/modules/std.pass.cpp +++ b/libcxx/test/std/modules/std.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17, c++20 // UNSUPPORTED: libcpp-has-no-std-modules -// UNSUPPORTED: modules-build +// UNSUPPORTED: clang-modules-build // A minimal test to validate import works. diff --git a/libcxx/test/std/ranges/range.adaptors/range.filter/iterator/arrow.pass.cpp b/libcxx/test/std/ranges/range.adaptors/range.filter/iterator/arrow.pass.cpp --- a/libcxx/test/std/ranges/range.adaptors/range.filter/iterator/arrow.pass.cpp +++ b/libcxx/test/std/ranges/range.adaptors/range.filter/iterator/arrow.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // This test is hitting Clang bugs with LSV in older versions of Clang. -// UNSUPPORTED: modules-build && (clang-15 || apple-clang-14) +// UNSUPPORTED: clang-modules-build && (clang-15 || apple-clang-14) // UNSUPPORTED: c++03, c++11, c++14, c++17 diff --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py --- a/libcxx/utils/libcxx/test/params.py +++ b/libcxx/utils/libcxx/test/params.py @@ -132,7 +132,7 @@ "`clang` for Clang modules", default=lambda cfg: next(s for s in _allModules if getModuleFlag(cfg, s)), actions=lambda enable_modules: [ - AddFeature("modules-build"), + AddFeature("clang-modules-build"), AddCompileFlag("-fmodules"), AddCompileFlag("-fcxx-modules"), # AppleClang disregards -fmodules entirely when compiling C++. This enables modules for C++. # Note: We use a custom modules cache path to make sure that we don't reuse