diff --git a/libcxx/test/libcxx/assertions/modes/enabling_assertions_enables_extensive_mode.pass.cpp b/libcxx/test/libcxx/assertions/modes/enabling_assertions_enables_extensive_mode.pass.cpp index 11e8ae228f8c8..d4dad8b71fe92 100644 --- a/libcxx/test/libcxx/assertions/modes/enabling_assertions_enables_extensive_mode.pass.cpp +++ b/libcxx/test/libcxx/assertions/modes/enabling_assertions_enables_extensive_mode.pass.cpp @@ -11,7 +11,8 @@ // hardening mode. // `check_assertion.h` is only available starting from C++11 and requires Unix headers and regex support. -// UNSUPPORTED: c++03, !has-unix-headers, no-localization +// REQUIRES: has-unix-headers +// UNSUPPORTED: c++03, no-localization // The ability to set a custom abort message is required to compare the assertion message (which only happens in the // debug mode). // XFAIL: libcpp-hardening-mode=debug && availability-verbose_abort-missing diff --git a/libcxx/test/libcxx/assertions/modes/override_with_debug_mode.pass.cpp b/libcxx/test/libcxx/assertions/modes/override_with_debug_mode.pass.cpp index f49ad490780c3..02565d0b6a176 100644 --- a/libcxx/test/libcxx/assertions/modes/override_with_debug_mode.pass.cpp +++ b/libcxx/test/libcxx/assertions/modes/override_with_debug_mode.pass.cpp @@ -9,7 +9,8 @@ // This test ensures that we can override any hardening mode with the debug mode on a per-TU basis. // `check_assertion.h` is only available starting from C++11 and requires Unix headers and regex support. -// UNSUPPORTED: c++03, !has-unix-headers, no-localization +// REQUIRES: has-unix-headers +// UNSUPPORTED: c++03, no-localization // The ability to set a custom abort message is required to compare the assertion message. // XFAIL: availability-verbose_abort-missing // ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HARDENING_MODE -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_DEBUG diff --git a/libcxx/test/libcxx/assertions/modes/override_with_extensive_mode.pass.cpp b/libcxx/test/libcxx/assertions/modes/override_with_extensive_mode.pass.cpp index cf662e9eadf7a..74fe70feb077c 100644 --- a/libcxx/test/libcxx/assertions/modes/override_with_extensive_mode.pass.cpp +++ b/libcxx/test/libcxx/assertions/modes/override_with_extensive_mode.pass.cpp @@ -9,7 +9,8 @@ // This test ensures that we can override any hardening mode with the extensive hardening mode on a per-TU basis. // `check_assertion.h` is only available starting from C++11 and requires Unix headers and regex support. -// UNSUPPORTED: c++03, !has-unix-headers, no-localization +// REQUIRES: has-unix-headers +// UNSUPPORTED: c++03, no-localization // The ability to set a custom abort message is required to compare the assertion message (which only happens in the // debug mode). // XFAIL: libcpp-hardening-mode=debug && availability-verbose_abort-missing diff --git a/libcxx/test/libcxx/assertions/modes/override_with_fast_mode.pass.cpp b/libcxx/test/libcxx/assertions/modes/override_with_fast_mode.pass.cpp index 0989ad39a78ea..f243897a986b0 100644 --- a/libcxx/test/libcxx/assertions/modes/override_with_fast_mode.pass.cpp +++ b/libcxx/test/libcxx/assertions/modes/override_with_fast_mode.pass.cpp @@ -9,7 +9,8 @@ // This test ensures that we can override any hardening mode with the fast mode on a per-TU basis. // `check_assertion.h` is only available starting from C++11 and requires Unix headers and regex support. -// UNSUPPORTED: c++03, !has-unix-headers, no-localization +// REQUIRES: has-unix-headers +// UNSUPPORTED: c++03, no-localization // The ability to set a custom abort message is required to compare the assertion message (which only happens in the // debug mode). // XFAIL: libcpp-hardening-mode=debug && availability-verbose_abort-missing diff --git a/libcxx/test/libcxx/assertions/modes/override_with_unchecked_mode.pass.cpp b/libcxx/test/libcxx/assertions/modes/override_with_unchecked_mode.pass.cpp index 8ea8b731ec4d3..0922556c8dc01 100644 --- a/libcxx/test/libcxx/assertions/modes/override_with_unchecked_mode.pass.cpp +++ b/libcxx/test/libcxx/assertions/modes/override_with_unchecked_mode.pass.cpp @@ -9,7 +9,8 @@ // This test ensures that we can override any hardening mode with the unchecked mode on a per-TU basis. // `check_assertion.h` is only available starting from C++11 and requires Unix headers and regex support. -// UNSUPPORTED: c++03, !has-unix-headers, no-localization +// REQUIRES: has-unix-headers +// UNSUPPORTED: c++03, no-localization // ADDITIONAL_COMPILE_FLAGS: -U_LIBCPP_HARDENING_MODE -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_NONE #include diff --git a/libcxx/test/libcxx/containers/sequences/deque/asan_caterpillar.pass.cpp b/libcxx/test/libcxx/containers/sequences/deque/asan_caterpillar.pass.cpp index 4c7b2317d04d3..1701b89c72d87 100644 --- a/libcxx/test/libcxx/containers/sequences/deque/asan_caterpillar.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/deque/asan_caterpillar.pass.cpp @@ -12,7 +12,8 @@ // with origin in deque::__add_back_capacity. // `check_assertion.h` is only available starting from C++11 and requires Unix headers and regex support. -// UNSUPPORTED: c++03, !has-unix-headers, no-localization +// REQUIRES: has-unix-headers +// UNSUPPORTED: c++03, no-localization #include #include diff --git a/libcxx/test/std/algorithms/pstl.exception_handling.pass.cpp b/libcxx/test/std/algorithms/pstl.exception_handling.pass.cpp index bedb2258d1fd5..e24ce66314197 100644 --- a/libcxx/test/std/algorithms/pstl.exception_handling.pass.cpp +++ b/libcxx/test/std/algorithms/pstl.exception_handling.pass.cpp @@ -9,7 +9,8 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: no-exceptions // `check_assertion.h` requires Unix headers and regex support. -// UNSUPPORTED: !has-unix-headers, no-localization +// REQUIRES: has-unix-headers +// UNSUPPORTED: no-localization // UNSUPPORTED: libcpp-has-no-incomplete-pstl