Skip to content

Commit 3401b30

Browse files
committed
[libc++] Renames modules-build.
This is a followup of D157625. Using the name clang-modules-build makes it clear this is regarding the clang modules and not the C++23 std or std.compat module. Reviewed By: #libc, ldionne Differential Revision: https://reviews.llvm.org/D158927
1 parent 4c9223c commit 3401b30

26 files changed

+28
-28
lines changed

libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_nontrivial.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// UNSUPPORTED: c++03, c++11, c++14, c++17
1010
// In the modules build, adding another overload of `memmove` doesn't work.
11-
// UNSUPPORTED: modules-build
11+
// UNSUPPORTED: clang-modules-build
1212
// GCC complains about "ambiguating" `__builtin_memmove`.
1313
// UNSUPPORTED: gcc
1414

libcxx/test/libcxx/algorithms/alg.modifying.operations/copy_move_trivial.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// UNSUPPORTED: c++03, c++11, c++14, c++17
1010
// In the modules build, adding another overload of `memmove` doesn't work.
11-
// UNSUPPORTED: modules-build
11+
// UNSUPPORTED: clang-modules-build
1212
// GCC complains about "ambiguating" `__builtin_memmove`.
1313
// UNSUPPORTED: gcc
1414

libcxx/test/libcxx/algorithms/pstl.robust_against_customization_points_not_working.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// UNSUPPORTED: libcpp-has-no-incomplete-pstl
1111

1212
// Having a customization point outside the module doesn't work, so this test is inherintly module-hostile.
13-
// UNSUPPORTED: modules-build
13+
// UNSUPPORTED: clang-modules-build
1414

1515
// Make sure that the customization points get called properly when overloaded
1616

libcxx/test/libcxx/assertions/customize_verbose_abort.compile-time.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// This compile-time customization requires cross-file macros, which doesn't work with modules.
10-
// UNSUPPORTED: modules-build
10+
// UNSUPPORTED: clang-modules-build
1111

1212
// Make sure that we can customize the verbose termination function at compile-time by
1313
// defining _LIBCPP_VERBOSE_ABORT ourselves. Note that this does not have any

libcxx/test/libcxx/assertions/modes/debug_mode_not_1_or_0.verify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Hardened mode would additionally trigger the error that hardened and debug modes are mutually exclusive.
1212
// UNSUPPORTED: libcpp-hardening-mode=hardened
1313
// Modules build produces a different error ("Could not build module 'std'").
14-
// UNSUPPORTED: modules-build
14+
// UNSUPPORTED: clang-modules-build
1515
// ADDITIONAL_COMPILE_FLAGS: -Wno-macro-redefined -D_LIBCPP_ENABLE_DEBUG_MODE=2
1616

1717
#include <cassert>

libcxx/test/libcxx/assertions/modes/hardened_and_debug_mutually_exclusive.verify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// This test verifies that `_LIBCPP_ENABLE_HARDENED_MODE` and `_LIBCPP_ENABLE_DEBUG_MODE` are mutually exclusive.
1010

1111
// Modules build produces a different error ("Could not build module 'std'").
12-
// UNSUPPORTED: modules-build
12+
// UNSUPPORTED: clang-modules-build
1313
// ADDITIONAL_COMPILE_FLAGS: -Wno-macro-redefined -D_LIBCPP_ENABLE_HARDENED_MODE=1 -D_LIBCPP_ENABLE_DEBUG_MODE=1
1414

1515
#include <cassert>

libcxx/test/libcxx/assertions/modes/hardened_mode_not_1_or_0.verify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// Debug mode would additionally trigger the error that hardened and debug modes are mutually exclusive.
1212
// UNSUPPORTED: libcpp-hardening-mode=debug
1313
// Modules build produces a different error ("Could not build module 'std'").
14-
// UNSUPPORTED: modules-build
14+
// UNSUPPORTED: clang-modules-build
1515
// ADDITIONAL_COMPILE_FLAGS: -Wno-macro-redefined -D_LIBCPP_ENABLE_HARDENED_MODE=2
1616

1717
#include <cassert>

libcxx/test/libcxx/clang_modules_include.gen.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
#include <{header}>
4545
""")
4646

47-
# TODO: Remove the UNSUPPORTED{BLOCKLIT}: modules-build once issues with this test have been figured out.
47+
# TODO: Remove the UNSUPPORTED{BLOCKLIT}: clang-modules-build once issues with this test have been figured out.
4848
print(f"""\
4949
//--- __std_clang_module.compile.pass.mm
50-
// UNSUPPORTED{BLOCKLIT}: modules-build
50+
// UNSUPPORTED{BLOCKLIT}: clang-modules-build
5151
5252
// RUN{BLOCKLIT}: %{{cxx}} %s %{{flags}} %{{compile_flags}} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only
5353
54-
// REQUIRES{BLOCKLIT}: modules-build
54+
// REQUIRES{BLOCKLIT}: clang-modules-build
5555
5656
// GCC doesn't support -fcxx-modules
5757
// UNSUPPORTED{BLOCKLIT}: gcc

libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// UNSUPPORTED: modules-build
9+
// UNSUPPORTED: clang-modules-build
1010

1111
// Prevent <ext/hash_map> from generating deprecated warnings for this test.
1212
// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated

libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// UNSUPPORTED: modules-build
9+
// UNSUPPORTED: clang-modules-build
1010

1111
// Poison the std:: names we might use inside __gnu_cxx to ensure they're
1212
// properly qualified.

libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// UNSUPPORTED: modules-build
9+
// UNSUPPORTED: clang-modules-build
1010

1111
// Prevent <ext/hash_set> from generating deprecated warnings for this test.
1212
// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated

libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// UNSUPPORTED: modules-build
9+
// UNSUPPORTED: clang-modules-build
1010

1111
// Poison the std:: names we might use inside __gnu_cxx to ensure they're
1212
// properly qualified.

libcxx/test/libcxx/depr/depr.c.headers/extern_c.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// When building with modules, including headers inside extern "C" is an anti-pattern
1010
// that we don't want to support and can't support with LSV enabled.
11-
// UNSUPPORTED: modules-build
11+
// UNSUPPORTED: clang-modules-build
1212

1313
// Sometimes C++'s <foo.h> headers get included within extern "C" contexts. This
1414
// is ill-formed (no diagnostic required), per [using.headers]p3, but we permit

libcxx/test/libcxx/depr/depr.c.headers/stdint_h.xopen_source.compile.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// This test breaks when enabling LSV.
10-
// UNSUPPORTED: modules-build
10+
// UNSUPPORTED: clang-modules-build
1111

1212
// Test that limits macros are available when <stdint.h> is included
1313
// with or without macro _XOPEN_SOURCE=700.

libcxx/test/libcxx/extensions/hash/specializations.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//
77
//===----------------------------------------------------------------------===//
88

9-
// UNSUPPORTED: modules-build
9+
// UNSUPPORTED: clang-modules-build
1010

1111
// Prevent <ext/hash_set> from generating deprecated warnings for this test.
1212
// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated

libcxx/test/libcxx/include_as_c.sh.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// We're building as C, so this test doesn't work when building with modules.
10-
// UNSUPPORTED: modules-build
10+
// UNSUPPORTED: clang-modules-build
1111

1212
// GCC complains about unrecognized arguments because we're compiling the
1313
// file as C, but we're passing C++ flags on the command-line.

libcxx/test/libcxx/input.output/iostream.format/print.fun/vprint_unicode_windows.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
// UNSUPPORTED: GCC-ALWAYS_INLINE-FIXME
1212

1313
// Clang modules do not work with the definiton of _LIBCPP_TESTING_PRINT_WRITE_TO_WINDOWS_CONSOLE_FUNCTION
14-
// XFAIL: modules-build
14+
// XFAIL: clang-modules-build
1515

1616
// XFAIL: availability-fp_to_chars-missing
1717

libcxx/test/libcxx/language.support/support.c.headers/support.c.headers.other/math.lerp.verify.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
// declaration of 'lerp' must be imported from module 'std.compat.cmath'
1111
// before it is required
1212
// therefore disable the test in this configuration.
13-
// UNSUPPORTED: modules-build
13+
// UNSUPPORTED: clang-modules-build
1414

1515
// <math.h>
1616

libcxx/test/libcxx/language.support/timespec_get.xopen.compile.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// This test breaks when enabling LSV.
10-
// UNSUPPORTED: modules-build
10+
// UNSUPPORTED: clang-modules-build
1111

1212
// UNSUPPORTED: c++03, c++11, c++14
1313

libcxx/test/libcxx/module_std.gen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@
119119
//--- module_std.sh.cpp
120120
// UNSUPPORTED{BLOCKLIT}: c++03, c++11, c++14, c++17
121121
// UNSUPPORTED{BLOCKLIT}: libcpp-has-no-std-modules
122-
// UNSUPPORTED{BLOCKLIT}: modules-build
122+
// UNSUPPORTED{BLOCKLIT}: clang-modules-build
123123
124124
// REQUIRES{BLOCKLIT}: has-clang-tidy
125125

libcxx/test/libcxx/transitive_includes.gen.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
6969
// When built with modules, this test doesn't work because --trace-includes doesn't
7070
// report the stack of includes correctly.
71-
// UNSUPPORTED{BLOCKLIT}: modules-build
71+
// UNSUPPORTED{BLOCKLIT}: clang-modules-build
7272
7373
// This test uses --trace-includes, which is not supported by GCC.
7474
// UNSUPPORTED{BLOCKLIT}: gcc

libcxx/test/libcxx/utilities/utility/pairs/pairs.pair/non_trivial_copy_move_ABI.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// The test suite needs to define the ABI macros on the command line when
1010
// modules are enabled.
11-
// UNSUPPORTED: modules-build
11+
// UNSUPPORTED: clang-modules-build
1212

1313
// <utility>
1414

libcxx/test/lit.local.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ else:
4242
if (
4343
std
4444
and not "libcpp-has-no-std-modules" in config.available_features
45-
and not "modules-build" in config.available_features
45+
and not "clang-modules-build" in config.available_features
4646
):
4747
build = os.path.join(config.test_exec_root, "__config_module__")
4848
config.substitutions = appendToSubstitution(

libcxx/test/std/modules/std.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
// UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
1010

1111
// UNSUPPORTED: libcpp-has-no-std-modules
12-
// UNSUPPORTED: modules-build
12+
// UNSUPPORTED: clang-modules-build
1313

1414
// A minimal test to validate import works.
1515

libcxx/test/std/ranges/range.adaptors/range.filter/iterator/arrow.pass.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// This test is hitting Clang bugs with LSV in older versions of Clang.
10-
// UNSUPPORTED: modules-build && (clang-15 || apple-clang-14)
10+
// UNSUPPORTED: clang-modules-build && (clang-15 || apple-clang-14)
1111

1212
// UNSUPPORTED: c++03, c++11, c++14, c++17
1313

libcxx/utils/libcxx/test/params.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ def getModuleFlag(cfg, enable_modules):
132132
"`clang` for Clang modules",
133133
default=lambda cfg: next(s for s in _allModules if getModuleFlag(cfg, s)),
134134
actions=lambda enable_modules: [
135-
AddFeature("modules-build"),
135+
AddFeature("clang-modules-build"),
136136
AddCompileFlag("-fmodules"),
137137
AddCompileFlag("-fcxx-modules"), # AppleClang disregards -fmodules entirely when compiling C++. This enables modules for C++.
138138
# Note: We use a custom modules cache path to make sure that we don't reuse

0 commit comments

Comments
 (0)