[runtimes] Rename various libcpp-has-no-XYZ Lit features to just no-XYZ

Since those features are general properties of the environment, it makes sense to use them from libc++abi too, and so the name libcpp-has-no-xxx doesn't make sense. Differential Revision: https://reviews.llvm.org/D126482
2024-11-27 15:41:46 +00:00 · 2022-05-26 11:49:47 -04:00 · 2022-05-26 11:49:47 -04:00 · a7f9895cc1
commit a7f9895cc1
parent eb1c50378e
539 changed files with 578 additions and 575 deletions
--- a/libcxx/test/libcxx/atomics/atomics.syn/incompatible_with_stdatomic.verify.cpp
+++ b/libcxx/test/libcxx/atomics/atomics.syn/incompatible_with_stdatomic.verify.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // REQUIRES: c++03 || c++11 || c++14 || c++17 || c++20

 // This test ensures that we issue a reasonable diagnostic when including <atomic> after
--- a/libcxx/test/libcxx/atomics/stdatomic.h.syn/dont_hijack_header.compile.pass.cpp
+++ b/libcxx/test/libcxx/atomics/stdatomic.h.syn/dont_hijack_header.compile.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // This test ensures that we don't hijack the <stdatomic.h> header even when compiling
 // before C++23, since Clang used to provide that header before libc++ provided one.
--- a/libcxx/test/libcxx/debug/containers.multithread.pass.cpp
+++ b/libcxx/test/libcxx/debug/containers.multithread.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++11, c++14
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // UNSUPPORTED: libcxx-no-debug-mode, c++03
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1
--- a/libcxx/test/libcxx/debug/extern-templates.sh.cpp
+++ b/libcxx/test/libcxx/debug/extern-templates.sh.cpp
@ -11,7 +11,7 @@
 // necessary for correctness. See https://llvm.org/D94718 for details.

 // UNSUPPORTED: libcxx-no-debug-mode
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization
 // UNSUPPORTED: cant-build-shared-library

 // This test relies on linking a shared library and then passing that shared
--- a/libcxx/test/libcxx/depr/depr.c.headers/locale_h.pass.cpp
+++ b/libcxx/test/libcxx/depr/depr.c.headers/locale_h.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <locale.h>

--- a/libcxx/test/libcxx/depr/depr.str.strstreams/version.pass.cpp
+++ b/libcxx/test/libcxx/depr/depr.str.strstreams/version.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <strstream>

--- a/libcxx/test/libcxx/experimental/memory/memory.resource.aliases/header_regex_libcpp_version.pass.cpp
+++ b/libcxx/test/libcxx/experimental/memory/memory.resource.aliases/header_regex_libcpp_version.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <experimental/regex>

--- a/libcxx/test/libcxx/fuzzing/regex.pass.cpp
+++ b/libcxx/test/libcxx/fuzzing/regex.pass.cpp
@ -8,7 +8,7 @@

 // UNSUPPORTED: c++03, c++11
 // UNSUPPORTED: no-exceptions
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 #include <cstddef>
 #include <cstdint>
--- a/libcxx/test/libcxx/gdb/gdb_pretty_printer_test.sh.cpp
+++ b/libcxx/test/libcxx/gdb/gdb_pretty_printer_test.sh.cpp
@ -8,7 +8,7 @@

 // REQUIRES: host-has-gdb-with-python
 // REQUIRES: locale.en_US.UTF-8
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization
 // UNSUPPORTED: c++03

 // TODO: Investigate this failure, which happens only with the Bootstrapping build.
--- a/libcxx/test/libcxx/inclusions/filesystem.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/filesystem.inclusions.compile.pass.cpp
@ -12,7 +12,7 @@
 // clang-format off

 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // <filesystem>

--- a/libcxx/test/libcxx/inclusions/ios.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/ios.inclusions.compile.pass.cpp
@ -11,7 +11,7 @@
 //
 // clang-format off

-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <ios>

--- a/libcxx/test/libcxx/inclusions/iostream.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/iostream.inclusions.compile.pass.cpp
@ -11,7 +11,7 @@
 //
 // clang-format off

-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <iostream>

--- a/libcxx/test/libcxx/inclusions/regex.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/regex.inclusions.compile.pass.cpp
@ -11,7 +11,7 @@
 //
 // clang-format off

-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <regex>

--- a/libcxx/test/libcxx/inclusions/thread.inclusions.compile.pass.cpp
+++ b/libcxx/test/libcxx/inclusions/thread.inclusions.compile.pass.cpp
@ -12,7 +12,7 @@
 // clang-format off

 // UNSUPPORTED: c++03
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // <thread>

--- a/libcxx/test/libcxx/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
+++ b/libcxx/test/libcxx/input.output/filesystems/class.path/path.member/path.native.obs/string_alloc.pass.cpp
@ -9,7 +9,7 @@
 // UNSUPPORTED: c++03

 // These tests require locale for non-char paths
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/libcxx/input.output/iostream.format/input.streams/traits_mismatch.fail.cpp
+++ b/libcxx/test/libcxx/input.output/iostream.format/input.streams/traits_mismatch.fail.cpp
@ -13,7 +13,7 @@

 // The char type of the stream and the char_type of the traits have to match

-// UNSUPPORTED: libcpp-has-no-wide-characters
+// UNSUPPORTED: no-wide-characters

 #include <istream>
 #include <type_traits>
--- a/libcxx/test/libcxx/input.output/iostream.format/output.streams/traits_mismatch.fail.cpp
+++ b/libcxx/test/libcxx/input.output/iostream.format/output.streams/traits_mismatch.fail.cpp
@ -13,7 +13,7 @@

 // The char type of the stream and the char_type of the traits have to match

-// UNSUPPORTED: libcpp-has-no-wide-characters
+// UNSUPPORTED: no-wide-characters

 #include <ostream>
 #include <type_traits>
--- a/libcxx/test/libcxx/input.output/string.streams/traits_mismatch.fail.cpp
+++ b/libcxx/test/libcxx/input.output/string.streams/traits_mismatch.fail.cpp
@ -14,7 +14,7 @@
 //
 // The char type of the stream and the char_type of the traits have to match

-// UNSUPPORTED: libcpp-has-no-wide-characters
+// UNSUPPORTED: no-wide-characters

 #include <sstream>

--- a/libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/locale_dependent.compile.pass.cpp
+++ b/libcxx/test/libcxx/iterators/iterator.requirements/iterator.assoc.types/iterator.traits/locale_dependent.compile.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 #include <iterator>

--- a/libcxx/test/libcxx/localization/locales/locale.convenience/conversions/conversions.string/ctor_move.pass.cpp
+++ b/libcxx/test/libcxx/localization/locales/locale.convenience/conversions/conversions.string/ctor_move.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 // UNSUPPORTED: c++03

--- a/libcxx/test/libcxx/modules_include.sh.cpp
+++ b/libcxx/test/libcxx/modules_include.sh.cpp
@ -21,7 +21,7 @@

 // TODO: Some headers produce errors when we include them and the library has been
 //       configured without support for them, which breaks the modules build.
-// UNSUPPORTED: libcpp-has-no-localization, libcpp-has-no-filesystem-library, libcpp-has-no-threads, libcpp-has-no-wide-characters
+// UNSUPPORTED: no-localization, no-filesystem, no-threads, no-wide-characters

 // Prevent <ext/hash_map> from generating deprecated warnings for this test.
 #if defined(__DEPRECATED)
--- a/libcxx/test/libcxx/numerics/rand/rand.device/has-no-random-device.verify.cpp
+++ b/libcxx/test/libcxx/numerics/rand/rand.device/has-no-random-device.verify.cpp
@ -9,7 +9,7 @@
 // Make sure that std::random_device is not available in namespace std:: when
 // libc++ is built without support for random device.

-// REQUIRES: libcpp-has-no-random-device
+// REQUIRES: no-random-device

 #include <random>

--- a/libcxx/test/libcxx/ranges/has-no-incomplete-ranges.compile.pass.cpp
+++ b/libcxx/test/libcxx/ranges/has-no-incomplete-ranges.compile.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14, c++17
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem
 // REQUIRES: libcpp-has-no-incomplete-ranges

 // Test that _LIBCPP_HAS_NO_INCOMPLETE_RANGES disables the std::ranges namespace.
--- a/libcxx/test/libcxx/strings/c.strings/version_cwchar.pass.cpp
+++ b/libcxx/test/libcxx/strings/c.strings/version_cwchar.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 // <cwchar>

--- a/libcxx/test/libcxx/strings/c.strings/version_cwctype.pass.cpp
+++ b/libcxx/test/libcxx/strings/c.strings/version_cwctype.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 // <cwctype>

--- a/libcxx/test/libcxx/thread/futures/futures.promise/assert.set_exception.pass.cpp
+++ b/libcxx/test/libcxx/thread/futures/futures.promise/assert.set_exception.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // REQUIRES: has-unix-headers
-// UNSUPPORTED: c++03, libcpp-has-no-threads
+// UNSUPPORTED: c++03, no-threads
 // XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx{{10.9|10.10|10.11|10.12|10.13|10.14|10.15|11.0|12.0}}
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_ASSERTIONS=1

--- a/libcxx/test/libcxx/thread/futures/futures.promise/assert.set_exception_at_thread_exit.pass.cpp
+++ b/libcxx/test/libcxx/thread/futures/futures.promise/assert.set_exception_at_thread_exit.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // REQUIRES: has-unix-headers
-// UNSUPPORTED: c++03, libcpp-has-no-threads
+// UNSUPPORTED: c++03, no-threads
 // XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx{{10.9|10.10|10.11|10.12|10.13|10.14|10.15|11.0|12.0}}
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_ENABLE_ASSERTIONS=1

--- a/libcxx/test/libcxx/thread/futures/futures.task/types.pass.cpp
+++ b/libcxx/test/libcxx/thread/futures/futures.task/types.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // UNSUPPORTED: c++03

 // <future>
--- a/libcxx/test/libcxx/thread/futures/version.pass.cpp
+++ b/libcxx/test/libcxx/thread/futures/version.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // <future>

--- a/libcxx/test/libcxx/thread/thread.barrier/version.compile.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.barrier/version.compile.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // UNSUPPORTED: c++03, c++11

 // <barrier>
--- a/libcxx/test/libcxx/thread/thread.condition/PR30202_notify_from_pthread_created_thread.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.condition/PR30202_notify_from_pthread_created_thread.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // REQUIRES: libcpp-has-thread-api-pthread

 // notify_all_at_thread_exit(...) requires move semantics to transfer the
--- a/libcxx/test/libcxx/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.condition/thread.condition.condvar/native_handle.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external
+// UNSUPPORTED: no-threads, libcpp-has-thread-api-external

 // XFAIL: windows

--- a/libcxx/test/libcxx/thread/thread.condition/version.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.condition/version.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // <condition_variable>

--- a/libcxx/test/libcxx/thread/thread.latch/version.compile.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.latch/version.compile.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // UNSUPPORTED: c++03, c++11

 // <latch>
--- a/libcxx/test/libcxx/thread/thread.lock/thread.lock.guard/nodiscard.verify.cpp
+++ b/libcxx/test/libcxx/thread/thread.lock/thread.lock.guard/nodiscard.verify.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // [[nodiscard]] isn't supported in C++03 (not even as an extension)
 // UNSUPPORTED: c++03
--- a/libcxx/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/native_handle.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external
+// UNSUPPORTED: no-threads, libcpp-has-thread-api-external

 // XFAIL: windows

--- a/libcxx/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/native_handle.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external
+// UNSUPPORTED: no-threads, libcpp-has-thread-api-external

 // XFAIL: windows

--- a/libcxx/test/libcxx/thread/thread.mutex/thread_safety_annotations_not_enabled.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.mutex/thread_safety_annotations_not_enabled.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // <mutex>

--- a/libcxx/test/libcxx/thread/thread.mutex/thread_safety_lock_guard.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.mutex/thread_safety_lock_guard.pass.cpp
@ -10,7 +10,7 @@
 // the processing goes awry preventing the definition of the types.
 // XFAIL: msvc

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // REQUIRES: thread-safety

 // <mutex>
--- a/libcxx/test/libcxx/thread/thread.mutex/thread_safety_lock_unlock.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.mutex/thread_safety_lock_unlock.pass.cpp
@ -10,7 +10,7 @@
 // the processing goes awry preventing the definition of the types.
 // XFAIL: msvc

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // REQUIRES: thread-safety

 // <mutex>
--- a/libcxx/test/libcxx/thread/thread.mutex/thread_safety_missing_unlock.fail.cpp
+++ b/libcxx/test/libcxx/thread/thread.mutex/thread_safety_missing_unlock.fail.cpp
@ -10,7 +10,7 @@
 // the processing goes awry preventing the definition of the types.
 // XFAIL: msvc

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // REQUIRES: thread-safety

 // <mutex>
--- a/libcxx/test/libcxx/thread/thread.mutex/thread_safety_requires_capability.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.mutex/thread_safety_requires_capability.pass.cpp
@ -10,7 +10,7 @@
 // the processing goes awry preventing the definition of the types.
 // XFAIL: msvc

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // REQUIRES: thread-safety

 // <mutex>
--- a/libcxx/test/libcxx/thread/thread.mutex/version.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.mutex/version.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // <mutex>

--- a/libcxx/test/libcxx/thread/thread.semaphore/version.compile.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.semaphore/version.compile.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // UNSUPPORTED: c++03, c++11

 // <semaphore>
--- a/libcxx/test/libcxx/thread/thread.threads/create_late.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.threads/create_late.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // UNSUPPORTED: c++03

 #include "make_test_thread.h"
--- a/libcxx/test/libcxx/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.threads/thread.thread.class/thread.thread.member/native_handle.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external
+// UNSUPPORTED: no-threads, libcpp-has-thread-api-external

 // XFAIL: windows

--- a/libcxx/test/libcxx/thread/thread.threads/thread.thread.class/types.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.threads/thread.thread.class/types.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads, libcpp-has-thread-api-external
+// UNSUPPORTED: no-threads, libcpp-has-thread-api-external
 // REQUIRES: libcpp-has-thread-api-pthread

 // <thread>
--- a/libcxx/test/libcxx/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.threads/thread.thread.this/sleep_for.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // Until 58a0a70fb2f1, this_thread::sleep_for could sometimes get interrupted
 // by signals and this test would fail spuriously. Disable the test on the
--- a/libcxx/test/libcxx/thread/thread.threads/thread.thread.this/sleep_for.signals.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.threads/thread.thread.this/sleep_for.signals.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // This test uses the POSIX header <sys/time.h> which Windows doesn't provide
 // UNSUPPORTED: windows
--- a/libcxx/test/libcxx/thread/thread.threads/version.pass.cpp
+++ b/libcxx/test/libcxx/thread/thread.threads/version.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // <thread>

--- a/libcxx/test/libcxx/utilities/memory/util.smartptr/race_condition.pass.cpp
+++ b/libcxx/test/libcxx/utilities/memory/util.smartptr/race_condition.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 //
 // <memory>
 //
--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_all.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_all.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // XFAIL: c++03
 // XFAIL: !non-lockfree-atomics

--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_one.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_notify_one.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // XFAIL: c++03
 // XFAIL: !non-lockfree-atomics

--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_wait.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_wait.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // XFAIL: c++03
 // XFAIL: !non-lockfree-atomics

--- a/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_wait_explicit.pass.cpp
+++ b/libcxx/test/std/atomics/atomics.types.operations/atomics.types.operations.wait/atomic_wait_explicit.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads
 // XFAIL: c++03
 // XFAIL: !non-lockfree-atomics

--- a/libcxx/test/std/atomics/stdatomic.h.syn/types.compile.pass.cpp
+++ b/libcxx/test/std/atomics/stdatomic.h.syn/types.compile.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14, c++17, c++20
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-threads

 // <stdatomic.h>

--- a/libcxx/test/std/containers/iterator.rel_ops.compile.pass.cpp
+++ b/libcxx/test/std/containers/iterator.rel_ops.compile.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // std::filesystem is unavailable prior to macOS 10.15
 // XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
--- a/libcxx/test/std/depr/depr.c.headers/locale_h.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/locale_h.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <locale.h>

--- a/libcxx/test/std/depr/depr.c.headers/wchar_h.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/wchar_h.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 // <wchar.h>

--- a/libcxx/test/std/depr/depr.c.headers/wctype_h.pass.cpp
+++ b/libcxx/test/std/depr/depr.c.headers/wctype_h.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 // <wctype.h>

--- a/libcxx/test/std/depr/depr.ios.members/lit.local.cfg
+++ b/libcxx/test/std/depr/depr.ios.members/lit.local.cfg
@ -1,2 +1,2 @@
-if 'libcpp-has-no-localization' in config.available_features:
+if 'no-localization' in config.available_features:
  config.unsupported = True
--- a/libcxx/test/std/depr/depr.str.strstreams/lit.local.cfg
+++ b/libcxx/test/std/depr/depr.str.strstreams/lit.local.cfg
@ -1,2 +1,2 @@
-if 'libcpp-has-no-localization' in config.available_features:
+if 'no-localization' in config.available_features:
  config.unsupported = True
--- a/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/stream_inserter.pass.cpp
+++ b/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.nonmembers/stream_inserter.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <system_error>

--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.cons/ostream_joiner.cons.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <experimental/iterator>
 //
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.creation/make_ostream_joiner.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.creation/make_ostream_joiner.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <experimental/iterator>
 //
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.assign.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <experimental/iterator>
 //
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.postincrement.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.postincrement.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <experimental/iterator>
 //
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.pretincrement.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.pretincrement.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <experimental/iterator>
 //
--- a/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.star.pass.cpp
+++ b/libcxx/test/std/experimental/iterator/ostream.joiner/ostream.joiner.ops/ostream_joiner.op.star.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <experimental/iterator>
 //
--- a/libcxx/test/std/experimental/memory/memory.resource.aliases/header_regex_synop.pass.cpp
+++ b/libcxx/test/std/experimental/memory/memory.resource.aliases/header_regex_synop.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <experimental/regex>

--- a/libcxx/test/std/input.output/file.streams/fstreams/filebuf.members/open_path.pass.cpp
+++ b/libcxx/test/std/input.output/file.streams/fstreams/filebuf.members/open_path.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // Filesystem is supported on Apple platforms starting with macosx10.15.
 // UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
--- a/libcxx/test/std/input.output/file.streams/fstreams/fstream.cons/path.pass.cpp
+++ b/libcxx/test/std/input.output/file.streams/fstreams/fstream.cons/path.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // Filesystem is supported on Apple platforms starting with macosx10.15.
 // UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
--- a/libcxx/test/std/input.output/file.streams/fstreams/fstream.members/open_path.pass.cpp
+++ b/libcxx/test/std/input.output/file.streams/fstreams/fstream.members/open_path.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // Filesystem is supported on Apple platforms starting with macosx10.15.
 // UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
--- a/libcxx/test/std/input.output/file.streams/fstreams/ifstream.cons/path.pass.cpp
+++ b/libcxx/test/std/input.output/file.streams/fstreams/ifstream.cons/path.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // Filesystem is supported on Apple platforms starting with macosx10.15.
 // UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
--- a/libcxx/test/std/input.output/file.streams/fstreams/ifstream.members/open_path.pass.cpp
+++ b/libcxx/test/std/input.output/file.streams/fstreams/ifstream.members/open_path.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // Filesystem is supported on Apple platforms starting with macosx10.15.
 // UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
--- a/libcxx/test/std/input.output/file.streams/fstreams/ofstream.cons/path.pass.cpp
+++ b/libcxx/test/std/input.output/file.streams/fstreams/ofstream.cons/path.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // Filesystem is supported on Apple platforms starting with macosx10.15.
 // UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
--- a/libcxx/test/std/input.output/file.streams/fstreams/ofstream.members/open_path.pass.cpp
+++ b/libcxx/test/std/input.output/file.streams/fstreams/ofstream.members/open_path.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03, c++11, c++14
-// UNSUPPORTED: libcpp-has-no-filesystem-library
+// UNSUPPORTED: no-filesystem

 // Filesystem is supported on Apple platforms starting with macosx10.15.
 // UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}}
--- a/libcxx/test/std/input.output/file.streams/lit.local.cfg
+++ b/libcxx/test/std/input.output/file.streams/lit.local.cfg
@ -1,3 +1,3 @@
 # All non-trivial uses of iostreams require localization support
-if 'libcpp-has-no-localization' in config.available_features:
+if 'no-localization' in config.available_features:
  config.unsupported = True
--- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.io/directory_entry.io.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.io/directory_entry.io.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>
 //
--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.append.pass.cpp
@ -9,7 +9,7 @@
 // UNSUPPORTED: c++03

 // These tests require locale for non-char paths
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.assign/source.pass.cpp
@ -9,7 +9,7 @@
 // UNSUPPORTED: c++03

 // These tests require locale for non-char paths
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.charconv.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.charconv.pass.cpp
@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//

-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization
 // UNSUPPORTED: c++03
 // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS

--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.concat.pass.cpp
@ -9,7 +9,7 @@
 // UNSUPPORTED: c++03

 // These tests require locale for non-char paths
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.construct/source.pass.cpp
@ -9,7 +9,7 @@
 // UNSUPPORTED: c++03

 // These tests require locale for non-char paths
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/generic_string_alloc.pass.cpp
@ -9,7 +9,7 @@
 // UNSUPPORTED: c++03

 // These tests require locale for non-char paths
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/named_overloads.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.generic.obs/named_overloads.pass.cpp
@ -9,7 +9,7 @@
 // UNSUPPORTED: c++03

 // These tests require locale for non-char paths
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/named_overloads.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.member/path.native.obs/named_overloads.pass.cpp
@ -9,7 +9,7 @@
 // UNSUPPORTED: c++03

 // These tests require locale for non-char paths
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/path.io.pass.cpp
@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03
-// UNSUPPORTED: libcpp-has-no-localization
+// UNSUPPORTED: no-localization

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/toctou.pass.cpp
+++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.remove_all/toctou.pass.cpp
@ -7,8 +7,8 @@
 //===----------------------------------------------------------------------===//

 // UNSUPPORTED: c++03
-// UNSUPPORTED: libcpp-has-no-localization
-// UNSUPPORTED: libcpp-has-no-threads
+// UNSUPPORTED: no-localization
+// UNSUPPORTED: no-threads

 // <filesystem>

--- a/libcxx/test/std/input.output/filesystems/lit.local.cfg
+++ b/libcxx/test/std/input.output/filesystems/lit.local.cfg
@ -6,5 +6,5 @@ if 'use_system_cxx_lib' in config.available_features:
  if any('target=x86_64-apple-macosx{}'.format(v) in config.available_features for v in too_old):
    config.unsupported = True

-if 'libcpp-has-no-filesystem-library' in config.available_features:
+if 'no-filesystem' in config.available_features:
    config.unsupported = True
--- a/libcxx/test/std/input.output/input.output.general/lit.local.cfg
+++ b/libcxx/test/std/input.output/input.output.general/lit.local.cfg
@ -1,3 +1,3 @@
 # All non-trivial uses of iostreams require localization support
-if 'libcpp-has-no-localization' in config.available_features:
+if 'no-localization' in config.available_features:
  config.unsupported = True
--- a/libcxx/test/std/input.output/iostream.format/lit.local.cfg
+++ b/libcxx/test/std/input.output/iostream.format/lit.local.cfg
@ -1,3 +1,3 @@
 # All non-trivial uses of iostreams require localization support
-if 'libcpp-has-no-localization' in config.available_features:
+if 'no-localization' in config.available_features:
  config.unsupported = True
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT.pass.cpp
@ -14,7 +14,7 @@
 // template<class charT, class traits>
 //   basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>& out, charT c);

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 #include <ostream>
 #include <cassert>
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/CharT_pointer.pass.cpp
@ -14,7 +14,7 @@
 // template<class charT, class traits>
 //   basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>& out, const charT* s);

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 #include <ostream>
 #include <cassert>
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide.pass.cpp
@ -14,7 +14,7 @@
 // template<class charT, class traits>
 //   basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>& out, char c);

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 #include <ostream>
 #include <cassert>
--- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
+++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.character/char_to_wide_pointer.pass.cpp
@ -14,7 +14,7 @@
 // template<class charT, class traits>
 //   basic_ostream<charT,traits>& operator<<(basic_ostream<charT,traits>& out, const char* s);

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 #include <ostream>
 #include <cassert>
--- a/libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_char.verify.cpp
+++ b/libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_char.verify.cpp
@ -11,7 +11,7 @@
 // quoted

 // UNSUPPORTED: c++03, c++11
-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 #include <iomanip>
 #include <sstream>
--- a/libcxx/test/std/input.output/iostream.forward/lit.local.cfg
+++ b/libcxx/test/std/input.output/iostream.forward/lit.local.cfg
@ -1,3 +1,3 @@
 # All non-trivial uses of iostreams require localization support
-if 'libcpp-has-no-localization' in config.available_features:
+if 'no-localization' in config.available_features:
  config.unsupported = True
--- a/libcxx/test/std/input.output/iostream.objects/lit.local.cfg
+++ b/libcxx/test/std/input.output/iostream.objects/lit.local.cfg
@ -1,3 +1,3 @@
 # All non-trivial uses of iostreams require localization support
-if 'libcpp-has-no-localization' in config.available_features:
+if 'no-localization' in config.available_features:
  config.unsupported = True
--- a/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcerr.sh.cpp
+++ b/libcxx/test/std/input.output/iostream.objects/wide.stream.objects/wcerr.sh.cpp
@ -10,7 +10,7 @@

 // istream wcerr;

-// XFAIL: libcpp-has-no-wide-characters
+// XFAIL: no-wide-characters

 // UNSUPPORTED: executor-has-no-bash
 // FILE_DEPENDENCIES: ../check-stderr.sh
--- a/Show More
+++ b/Show More