diff --git a/libcxx/docs/TestingLibcxx.rst b/libcxx/docs/TestingLibcxx.rst --- a/libcxx/docs/TestingLibcxx.rst +++ b/libcxx/docs/TestingLibcxx.rst @@ -153,7 +153,7 @@ **Default**: False Enable or disable testing against the installed version of libc++ library. - This impacts whether the ``with_system_cxx_lib`` Lit feature is defined or + This impacts whether the ``use_system_cxx_lib`` Lit feature is defined or not. The ``cxx_library_root`` and ``cxx_runtime_root`` parameters should still be used to specify the path of the library to link to and run against, respectively. diff --git a/libcxx/test/configs/legacy.cfg.in b/libcxx/test/configs/legacy.cfg.in --- a/libcxx/test/configs/legacy.cfg.in +++ b/libcxx/test/configs/legacy.cfg.in @@ -21,7 +21,8 @@ config.sanitizer_library = "@LIBCXX_SANITIZER_LIBRARY@" config.configuration_variant = "@LIBCXX_LIT_VARIANT@" config.host_triple = "@LLVM_HOST_TRIPLE@" -config.target_triple = "@TARGET_TRIPLE@" +if "@TARGET_TRIPLE@": + config.target_triple = "@TARGET_TRIPLE@" config.sysroot = "@LIBCXX_SYSROOT@" config.gcc_toolchain = "@LIBCXX_GCC_TOOLCHAIN@" config.generate_coverage = @LIBCXX_GENERATE_COVERAGE@ diff --git a/libcxx/test/libcxx/language.support/cxa_deleted_virtual.pass.cpp b/libcxx/test/libcxx/language.support/cxa_deleted_virtual.pass.cpp --- a/libcxx/test/libcxx/language.support/cxa_deleted_virtual.pass.cpp +++ b/libcxx/test/libcxx/language.support/cxa_deleted_virtual.pass.cpp @@ -11,12 +11,12 @@ // Test exporting the symbol: "__cxa_deleted_virtual" in macosx // But don't expect the symbol to be exported in previous versions. // -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 struct S { virtual void f() = delete; virtual ~S() {} }; int main(int, char**) { diff --git a/libcxx/test/libcxx/language.support/support.dynamic/aligned_alloc_availability.verify.cpp b/libcxx/test/libcxx/language.support/support.dynamic/aligned_alloc_availability.verify.cpp --- a/libcxx/test/libcxx/language.support/support.dynamic/aligned_alloc_availability.verify.cpp +++ b/libcxx/test/libcxx/language.support/support.dynamic/aligned_alloc_availability.verify.cpp @@ -16,11 +16,11 @@ // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// REQUIRES: with_system_cxx_lib=macosx10.13 || \ -// REQUIRES: with_system_cxx_lib=macosx10.12 || \ -// REQUIRES: with_system_cxx_lib=macosx10.11 || \ -// REQUIRES: with_system_cxx_lib=macosx10.10 || \ -// REQUIRES: with_system_cxx_lib=macosx10.9 +// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.13 || \ +// REQUIRES: x86_64-apple-macosx10.12 || \ +// REQUIRES: x86_64-apple-macosx10.11 || \ +// REQUIRES: x86_64-apple-macosx10.10 || \ +// REQUIRES: x86_64-apple-macosx10.9) #include #include diff --git a/libcxx/test/libcxx/language.support/support.dynamic/libcpp_deallocate.sh.cpp b/libcxx/test/libcxx/language.support/support.dynamic/libcpp_deallocate.sh.cpp --- a/libcxx/test/libcxx/language.support/support.dynamic/libcpp_deallocate.sh.cpp +++ b/libcxx/test/libcxx/language.support/support.dynamic/libcpp_deallocate.sh.cpp @@ -16,10 +16,10 @@ // The dylibs shipped before macosx10.13 do not contain the aligned allocation // functions, so trying to force using those with -faligned-allocation results // in a link error. -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // AppleClang < 10 incorrectly warns that aligned allocation is not supported // even when it is supported. diff --git a/libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp b/libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp --- a/libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp +++ b/libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp @@ -16,10 +16,10 @@ // The dylibs shipped before macosx10.13 do not contain the aligned allocation // functions, so trying to force using those with -faligned-allocation results // in a link error. -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // REQUIRES: -faligned-allocation // ADDITIONAL_COMPILE_FLAGS: -faligned-allocation diff --git a/libcxx/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp b/libcxx/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp --- a/libcxx/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp +++ b/libcxx/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp @@ -15,11 +15,11 @@ // GCC 5 doesn't support aligned allocation // UNSUPPORTED: gcc-5 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include diff --git a/libcxx/test/libcxx/selftest/dsl/dsl.sh.py b/libcxx/test/libcxx/selftest/dsl/dsl.sh.py --- a/libcxx/test/libcxx/selftest/dsl/dsl.sh.py +++ b/libcxx/test/libcxx/selftest/dsl/dsl.sh.py @@ -342,6 +342,10 @@ def test_empty_choices_should_blow_up(self): self.assertRaises(ValueError, lambda: dsl.Parameter(name='std', choices=[], type=str, help='', actions=lambda _: [])) + def test_no_choices_is_ok(self): + param = dsl.Parameter(name='triple', type=str, help='', actions=lambda _: []) + self.assertEqual(param.name, 'triple') + def test_name_is_set_correctly(self): param = dsl.Parameter(name='std', choices=['c++03'], type=str, help='', actions=lambda _: []) self.assertEqual(param.name, 'std') diff --git a/libcxx/test/libcxx/thread/atomic.availability.verify.cpp b/libcxx/test/libcxx/thread/atomic.availability.verify.cpp --- a/libcxx/test/libcxx/thread/atomic.availability.verify.cpp +++ b/libcxx/test/libcxx/thread/atomic.availability.verify.cpp @@ -7,13 +7,14 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// REQUIRES: with_system_cxx_lib=macosx10.9 || \ -// REQUIRES: with_system_cxx_lib=macosx10.10 || \ -// REQUIRES: with_system_cxx_lib=macosx10.11 || \ -// REQUIRES: with_system_cxx_lib=macosx10.12 || \ -// REQUIRES: with_system_cxx_lib=macosx10.13 || \ -// REQUIRES: with_system_cxx_lib=macosx10.14 || \ -// REQUIRES: with_system_cxx_lib=macosx10.15 +// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \ +// REQUIRES: x86_64-apple-macosx10.10 || \ +// REQUIRES: x86_64-apple-macosx10.11 || \ +// REQUIRES: x86_64-apple-macosx10.12 || \ +// REQUIRES: x86_64-apple-macosx10.13 || \ +// REQUIRES: x86_64-apple-macosx10.14 || \ +// REQUIRES: x86_64-apple-macosx10.15) + // Test the availability markup on the C++20 Synchronization Library // additions to . diff --git a/libcxx/test/libcxx/thread/barrier.availability.verify.cpp b/libcxx/test/libcxx/thread/barrier.availability.verify.cpp --- a/libcxx/test/libcxx/thread/barrier.availability.verify.cpp +++ b/libcxx/test/libcxx/thread/barrier.availability.verify.cpp @@ -7,13 +7,14 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// REQUIRES: with_system_cxx_lib=macosx10.9 || \ -// REQUIRES: with_system_cxx_lib=macosx10.10 || \ -// REQUIRES: with_system_cxx_lib=macosx10.11 || \ -// REQUIRES: with_system_cxx_lib=macosx10.12 || \ -// REQUIRES: with_system_cxx_lib=macosx10.13 || \ -// REQUIRES: with_system_cxx_lib=macosx10.14 || \ -// REQUIRES: with_system_cxx_lib=macosx10.15 +// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \ +// REQUIRES: x86_64-apple-macosx10.10 || \ +// REQUIRES: x86_64-apple-macosx10.11 || \ +// REQUIRES: x86_64-apple-macosx10.12 || \ +// REQUIRES: x86_64-apple-macosx10.13 || \ +// REQUIRES: x86_64-apple-macosx10.14 || \ +// REQUIRES: x86_64-apple-macosx10.15) + // Test the availability markup on std::barrier. diff --git a/libcxx/test/libcxx/thread/latch.availability.verify.cpp b/libcxx/test/libcxx/thread/latch.availability.verify.cpp --- a/libcxx/test/libcxx/thread/latch.availability.verify.cpp +++ b/libcxx/test/libcxx/thread/latch.availability.verify.cpp @@ -7,13 +7,14 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// REQUIRES: with_system_cxx_lib=macosx10.9 || \ -// REQUIRES: with_system_cxx_lib=macosx10.10 || \ -// REQUIRES: with_system_cxx_lib=macosx10.11 || \ -// REQUIRES: with_system_cxx_lib=macosx10.12 || \ -// REQUIRES: with_system_cxx_lib=macosx10.13 || \ -// REQUIRES: with_system_cxx_lib=macosx10.14 || \ -// REQUIRES: with_system_cxx_lib=macosx10.15 +// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \ +// REQUIRES: x86_64-apple-macosx10.10 || \ +// REQUIRES: x86_64-apple-macosx10.11 || \ +// REQUIRES: x86_64-apple-macosx10.12 || \ +// REQUIRES: x86_64-apple-macosx10.13 || \ +// REQUIRES: x86_64-apple-macosx10.14 || \ +// REQUIRES: x86_64-apple-macosx10.15) + // Test the availability markup on std::latch. diff --git a/libcxx/test/libcxx/thread/semaphore.availability.verify.cpp b/libcxx/test/libcxx/thread/semaphore.availability.verify.cpp --- a/libcxx/test/libcxx/thread/semaphore.availability.verify.cpp +++ b/libcxx/test/libcxx/thread/semaphore.availability.verify.cpp @@ -7,13 +7,14 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// REQUIRES: with_system_cxx_lib=macosx10.9 || \ -// REQUIRES: with_system_cxx_lib=macosx10.10 || \ -// REQUIRES: with_system_cxx_lib=macosx10.11 || \ -// REQUIRES: with_system_cxx_lib=macosx10.12 || \ -// REQUIRES: with_system_cxx_lib=macosx10.13 || \ -// REQUIRES: with_system_cxx_lib=macosx10.14 || \ -// REQUIRES: with_system_cxx_lib=macosx10.15 +// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \ +// REQUIRES: x86_64-apple-macosx10.10 || \ +// REQUIRES: x86_64-apple-macosx10.11 || \ +// REQUIRES: x86_64-apple-macosx10.12 || \ +// REQUIRES: x86_64-apple-macosx10.13 || \ +// REQUIRES: x86_64-apple-macosx10.14 || \ +// REQUIRES: x86_64-apple-macosx10.15) + // Test the availability markup on std::counting_semaphore and std::binary_semaphore. diff --git 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 --- 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 @@ -14,10 +14,10 @@ // UNSUPPORTED: c++03 // PR30202 was fixed starting in macosx10.13. -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git 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 --- 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 @@ -11,9 +11,9 @@ // Until 58a0a70fb2f1, this_thread::sleep_for could sometimes get interrupted // by signals and this test would fail spuriously. Disable the test on the // corresponding system libraries. -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git 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 --- 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 @@ -14,9 +14,9 @@ // Until 58a0a70fb2f1, this_thread::sleep_for misbehaves when interrupted by // a signal, as tested here. Disable the test on the corresponding system // libraries. -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/libcxx/utilities/charconv/charconv.to.chars/availability.fail.cpp b/libcxx/test/libcxx/utilities/charconv/charconv.to.chars/availability.fail.cpp --- a/libcxx/test/libcxx/utilities/charconv/charconv.to.chars/availability.fail.cpp +++ b/libcxx/test/libcxx/utilities/charconv/charconv.to.chars/availability.fail.cpp @@ -7,12 +7,12 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03 -// REQUIRES: with_system_cxx_lib=macosx10.9 || \ -// REQUIRES: with_system_cxx_lib=macosx10.10 || \ -// REQUIRES: with_system_cxx_lib=macosx10.11 || \ -// REQUIRES: with_system_cxx_lib=macosx10.12 || \ -// REQUIRES: with_system_cxx_lib=macosx10.13 || \ -// REQUIRES: with_system_cxx_lib=macosx10.14 +// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \ +// REQUIRES: x86_64-apple-macosx10.10 || \ +// REQUIRES: x86_64-apple-macosx10.11 || \ +// REQUIRES: x86_64-apple-macosx10.12 || \ +// REQUIRES: x86_64-apple-macosx10.13 || \ +// REQUIRES: x86_64-apple-macosx10.14) // Test the availability markup on std::to_chars. diff --git 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 --- 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 @@ -12,14 +12,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp --- a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp +++ b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/generic_category.pass.cpp @@ -7,10 +7,10 @@ //===----------------------------------------------------------------------===// // XFAIL: suse-linux-enterprise-server-11 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp --- a/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp +++ b/libcxx/test/std/diagnostics/syserr/syserr.errcat/syserr.errcat.objects/system_category.pass.cpp @@ -13,10 +13,10 @@ // const error_category& system_category(); // XFAIL: suse-linux-enterprise-server-11 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include #include diff --git 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 --- 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 @@ -10,12 +10,12 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git 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 --- 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 @@ -10,12 +10,12 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git 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 --- 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 @@ -10,12 +10,12 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git 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 --- 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 @@ -10,12 +10,12 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // FILE_DEPENDENCIES: test.dat diff --git 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 --- 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 @@ -10,12 +10,12 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // FILE_DEPENDENCIES: test.dat diff --git 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 --- 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 @@ -10,12 +10,12 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git 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 --- 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 @@ -10,12 +10,12 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp --- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.mods/refresh.pass.cpp @@ -10,7 +10,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp --- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/file_size.pass.cpp @@ -10,7 +10,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp --- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/hard_link_count.pass.cpp @@ -10,7 +10,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp --- a/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/class.directory_entry/directory_entry.obs/last_write_time.pass.cpp @@ -10,7 +10,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp --- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp @@ -12,7 +12,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp --- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directories/create_directories.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++03 // This test requires the dylib support introduced in D92769. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp --- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++03 // This test requires the dylib support introduced in D92769. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp --- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.create_directory/create_directory_with_attributes.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++03 // This test requires the dylib support introduced in D92769. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp --- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.file_size/file_size.pass.cpp @@ -10,7 +10,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp --- a/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp +++ b/libcxx/test/std/input.output/filesystems/fs.op.funcs/fs.op.last_write_time/last_write_time.pass.cpp @@ -12,7 +12,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: with_system_cxx_lib=macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 // diff --git a/libcxx/test/std/input.output/filesystems/lit.local.cfg b/libcxx/test/std/input.output/filesystems/lit.local.cfg --- a/libcxx/test/std/input.output/filesystems/lit.local.cfg +++ b/libcxx/test/std/input.output/filesystems/lit.local.cfg @@ -2,8 +2,9 @@ # Automatically disable the tests when we're running the test # suite against an older macOS. too_old = {'10.9', '10.10', '10.11', '10.12', '10.13', '10.14'} -if any('with_system_cxx_lib=macosx{}'.format(v) in config.available_features for v in too_old): - config.unsupported = True +if 'use_system_cxx_lib' in config.available_features: + if any('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: config.unsupported = True diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/bool.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/double.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/float.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/int.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_double.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/long_long.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/pointer.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/short.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_int.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_long_long.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream.formatted.arithmetic/unsigned_short.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.formatted/istream_extractors/streambuf.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_chart.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size.pass.cpp @@ -8,12 +8,12 @@ // In macosx10.9 to macosx10.14, streams are provided in the dylib AND they // have a bug in how they handle null-termination in case of errors (see D40677). -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_pointer_size_chart.pass.cpp @@ -8,12 +8,12 @@ // In macosx10.9 to macosx10.14, streams are provided in the dylib AND they // have a bug in how they handle null-termination in case of errors (see D40677). -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/get_streambuf_chart.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size.pass.cpp @@ -8,12 +8,12 @@ // In macosx10.9 to macosx10.14, streams are provided in the dylib AND they // have a bug in how they handle null-termination in case of errors (see D40677). -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/getline_pointer_size_chart.pass.cpp @@ -8,12 +8,12 @@ // In macosx10.9 to macosx10.14, streams are provided in the dylib AND they // have a bug in how they handle null-termination in case of errors (see D40677). -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/ignore.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/peek.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/peek.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/peek.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/peek.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/read.pass.cpp @@ -6,12 +6,12 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/seekg_off.pass.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/seekg_off.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/seekg_off.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/input.streams/istream.unformatted/seekg_off.pass.cpp @@ -6,9 +6,9 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/minmax_showbase.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/minmax_showbase.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/minmax_showbase.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/minmax_showbase.pass.cpp @@ -25,9 +25,9 @@ // This test exposes a regression that was not fixed yet in the libc++ // shipped with macOS 10.12, 10.13 and 10.14. See D32670 for details. -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 #include #include diff --git a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/minus1.pass.cpp b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/minus1.pass.cpp --- a/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/minus1.pass.cpp +++ b/libcxx/test/std/input.output/iostream.format/output.streams/ostream.formatted/ostream.inserters.arithmetic/minus1.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// XFAIL: with_system_cxx_lib=macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 // diff --git a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_Init/ios_Init.multiple.pass.cpp b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_Init/ios_Init.multiple.pass.cpp --- a/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_Init/ios_Init.multiple.pass.cpp +++ b/libcxx/test/std/input.output/iostreams.base/ios.base/ios.types/ios_Init/ios_Init.multiple.pass.cpp @@ -16,12 +16,12 @@ // The dylibs shipped on macOS so far do not contain the fix for PR43300, so // this test fails. -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 int main(int, char**) { diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/delete_align_val_t_replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/delete_align_val_t_replace.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/delete_align_val_t_replace.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/delete_align_val_t_replace.pass.cpp @@ -18,11 +18,11 @@ // However, support for that was broken prior to Clang 8 and AppleClang 11. // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // On Windows libc++ doesn't provide its own definitions for new/delete // but instead depends on the ones in VCRuntime. However VCRuntime does not diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t.pass.cpp @@ -16,11 +16,11 @@ // However, support for that was broken prior to Clang 8 and AppleClang 11. // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // test operator new diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow.pass.cpp @@ -16,11 +16,11 @@ // However, support for that was broken prior to Clang 8 and AppleClang 11. // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // test operator new (nothrow) diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow_replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow_replace.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow_replace.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow_replace.pass.cpp @@ -14,11 +14,11 @@ // However, support for that was broken prior to Clang 8 and AppleClang 11. // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // test operator new nothrow by replacing only operator new diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_fsizeddeallocation.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_fsizeddeallocation.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_fsizeddeallocation.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/sized_delete_array_fsizeddeallocation.pass.cpp @@ -12,9 +12,9 @@ // when sized deallocation is not supported, e.g., prior to C++14. // UNSUPPORTED: sanitizer-new-delete -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // REQUIRES: -fsized-deallocation // ADDITIONAL_COMPILE_FLAGS: -fsized-deallocation diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/delete_align_val_t_replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/delete_align_val_t_replace.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/delete_align_val_t_replace.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/delete_align_val_t_replace.pass.cpp @@ -18,11 +18,11 @@ // However, support for that was broken prior to Clang 8 and AppleClang 11. // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // On Windows libc++ doesn't provide its own definitions for new/delete // but instead depends on the ones in VCRuntime. However VCRuntime does not diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t.pass.cpp @@ -13,11 +13,11 @@ // However, support for that was broken prior to Clang 8 and AppleClang 11. // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // asan and msan will not call the new handler. // UNSUPPORTED: sanitizer-new-delete diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow.pass.cpp @@ -13,11 +13,11 @@ // However, support for that was broken prior to Clang 8 and AppleClang 11. // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // asan and msan will not call the new handler. // UNSUPPORTED: sanitizer-new-delete diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow_replace.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow_replace.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow_replace.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/new_align_val_t_nothrow_replace.pass.cpp @@ -14,11 +14,11 @@ // However, support for that was broken prior to Clang 8 and AppleClang 11. // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // test operator new nothrow by replacing only operator new diff --git a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_fsizeddeallocation.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_fsizeddeallocation.pass.cpp --- a/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_fsizeddeallocation.pass.cpp +++ b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/sized_delete_fsizeddeallocation.pass.cpp @@ -12,9 +12,9 @@ // when sized deallocation is not supported, e.g., prior to C++14. // UNSUPPORTED: sanitizer-new-delete -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // NOTE: Only clang-3.7 and GCC 5.1 and greater support -fsized-deallocation. // REQUIRES: -fsized-deallocation diff --git a/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp b/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp --- a/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp @@ -9,14 +9,14 @@ // UNSUPPORTED: no-exceptions // std::uncaught_exceptions() was introduced in the dylib on Mac OS 10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // However, std::uncaught_exceptions() gives the wrong answer in Mac OS 10.12 // and 10.13, where it only gives 0 or 1. This was fixed later. -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 // test uncaught_exceptions diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t_char8_t.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t_char8_t.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t_char8_t.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char16_t_char8_t.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t_char8_t.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t_char8_t.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t_char8_t.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt.byname/ctor_char32_t_char8_t.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t_char8_t.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t_char8_t.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t_char8_t.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/ctor_char16_t_char8_t.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t_char8_t.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t_char8_t.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t_char8_t.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/ctor_char32_t_char8_t.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_always_noconv.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_always_noconv.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_always_noconv.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_always_noconv.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_encoding.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_encoding.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_encoding.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_encoding.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_in.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_in.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_in.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_in.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_length.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_length.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_length.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_length.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_max_length.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_max_length.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_max_length.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_max_length.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_out.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_out.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_out.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_out.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_unshift.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_unshift.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_unshift.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char16_t_char8_t_unshift.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_always_noconv.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_always_noconv.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_always_noconv.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_always_noconv.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_encoding.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_encoding.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_encoding.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_encoding.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_in.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_in.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_in.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_in.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_length.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_length.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_length.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_length.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_max_length.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_max_length.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_max_length.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_max_length.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_out.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_out.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_out.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_out.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_unshift.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_unshift.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_unshift.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/char32_t_char8_t_unshift.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/locale.codecvt.members/utf_sanity_check.pass.cpp @@ -9,13 +9,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/types_char16_t_char8_t.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/types_char16_t_char8_t.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/types_char16_t_char8_t.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/types_char16_t_char8_t.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/types_char32_t_char8_t.pass.cpp b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/types_char32_t_char8_t.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/types_char32_t_char8_t.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.ctype/locale.codecvt/types_char32_t_char8_t.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.num.get/facet.num.get.members/get_long.pass.cpp @@ -15,12 +15,12 @@ // This test exercises the fix for PR28704, which isn't in the dylib for // some systems. -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include #include diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/assign.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/assign.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/assign.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/assign.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/char_pointer.pass.cpp @@ -15,13 +15,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/copy.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/copy.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/copy.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/copy.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/default.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/default.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/default.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/default.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/locale_char_pointer_cat.pass.cpp @@ -13,13 +13,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/locale_facetptr.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/locale_locale_cat.pass.cpp @@ -13,13 +13,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/locale_string_cat.pass.cpp @@ -13,13 +13,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.cons/string.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.cons/string.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.cons/string.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.cons/string.pass.cpp @@ -12,13 +12,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.members/combine.pass.cpp @@ -9,13 +9,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.statics/classic.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.statics/classic.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.statics/classic.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.statics/classic.pass.cpp @@ -9,13 +9,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/localization/locales/locale/locale.statics/global.pass.cpp b/libcxx/test/std/localization/locales/locale/locale.statics/global.pass.cpp --- a/libcxx/test/std/localization/locales/locale/locale.statics/global.pass.cpp +++ b/libcxx/test/std/localization/locales/locale/locale.statics/global.pass.cpp @@ -11,13 +11,13 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test runs in C++20, but we have deprecated codecvt in C++20. // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DISABLE_DEPRECATION_WARNINGS diff --git a/libcxx/test/std/numerics/rand/rand.device/ctor.pass.cpp b/libcxx/test/std/numerics/rand/rand.device/ctor.pass.cpp --- a/libcxx/test/std/numerics/rand/rand.device/ctor.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.device/ctor.pass.cpp @@ -8,9 +8,9 @@ // See bugs.llvm.org/PR20183 // -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // UNSUPPORTED: libcpp-has-no-random-device diff --git a/libcxx/test/std/numerics/rand/rand.device/eval.pass.cpp b/libcxx/test/std/numerics/rand/rand.device/eval.pass.cpp --- a/libcxx/test/std/numerics/rand/rand.device/eval.pass.cpp +++ b/libcxx/test/std/numerics/rand/rand.device/eval.pass.cpp @@ -8,9 +8,9 @@ // See bugs.llvm.org/PR20183 // -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // UNSUPPORTED: libcpp-has-no-random-device diff --git a/libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp --- a/libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp @@ -7,9 +7,9 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/strings/basic.string/string.capacity/reserve_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.capacity/reserve_size.pass.cpp --- a/libcxx/test/std/strings/basic.string/string.capacity/reserve_size.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.capacity/reserve_size.pass.cpp @@ -13,13 +13,13 @@ // This test relies on https://llvm.org/PR45368 being fixed, which isn't in // older Apple dylibs // -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include #include diff --git a/libcxx/test/std/thread/futures/futures.async/async_race.38682.pass.cpp b/libcxx/test/std/thread/futures/futures.async/async_race.38682.pass.cpp --- a/libcxx/test/std/thread/futures/futures.async/async_race.38682.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.async/async_race.38682.pass.cpp @@ -11,12 +11,12 @@ // There's currently no release of OS X whose dylib contains the patch for // PR38682. Since the fix for future is in the dylib, this test may fail. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // This test is designed to cause and allow TSAN to detect a race condition // in std::async, as reported in https://llvm.org/PR38682. diff --git a/libcxx/test/std/thread/futures/futures.future_error/what.pass.cpp b/libcxx/test/std/thread/futures/futures.future_error/what.pass.cpp --- a/libcxx/test/std/thread/futures/futures.future_error/what.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.future_error/what.pass.cpp @@ -11,9 +11,9 @@ // LWG 2056 changed the values of future_errc, so if we're using new headers // with an old library we'll get incorrect messages. // -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.barrier/arrive.pass.cpp b/libcxx/test/std/thread/thread.barrier/arrive.pass.cpp --- a/libcxx/test/std/thread/thread.barrier/arrive.pass.cpp +++ b/libcxx/test/std/thread/thread.barrier/arrive.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.barrier/arrive_and_drop.pass.cpp b/libcxx/test/std/thread/thread.barrier/arrive_and_drop.pass.cpp --- a/libcxx/test/std/thread/thread.barrier/arrive_and_drop.pass.cpp +++ b/libcxx/test/std/thread/thread.barrier/arrive_and_drop.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.barrier/arrive_and_wait.pass.cpp b/libcxx/test/std/thread/thread.barrier/arrive_and_wait.pass.cpp --- a/libcxx/test/std/thread/thread.barrier/arrive_and_wait.pass.cpp +++ b/libcxx/test/std/thread/thread.barrier/arrive_and_wait.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.barrier/completion.pass.cpp b/libcxx/test/std/thread/thread.barrier/completion.pass.cpp --- a/libcxx/test/std/thread/thread.barrier/completion.pass.cpp +++ b/libcxx/test/std/thread/thread.barrier/completion.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.latch/arrive_and_wait.pass.cpp b/libcxx/test/std/thread/thread.latch/arrive_and_wait.pass.cpp --- a/libcxx/test/std/thread/thread.latch/arrive_and_wait.pass.cpp +++ b/libcxx/test/std/thread/thread.latch/arrive_and_wait.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.latch/count_down.pass.cpp b/libcxx/test/std/thread/thread.latch/count_down.pass.cpp --- a/libcxx/test/std/thread/thread.latch/count_down.pass.cpp +++ b/libcxx/test/std/thread/thread.latch/count_down.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.latch/try_wait.pass.cpp b/libcxx/test/std/thread/thread.latch/try_wait.pass.cpp --- a/libcxx/test/std/thread/thread.latch/try_wait.pass.cpp +++ b/libcxx/test/std/thread/thread.latch/try_wait.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/default.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_assign.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/move_ctor.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // ALLOW_RETRIES: 2 diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_adopt_lock.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_defer_lock.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_duration.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_time_point.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/mutex_try_to_lock.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // ALLOW_RETRIES: 2 diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.locking/lock.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // ALLOW_RETRIES: 2 diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/mutex.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/op_bool.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.obs/owns_lock.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/assign.fail.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/assign.fail.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/assign.fail.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11, c++14 // shared_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/copy.fail.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/copy.fail.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/copy.fail.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11, c++14 // shared_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/default.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/default.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/default.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/default.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11, c++14 // shared_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/lock.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/lock_shared.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/lock_shared.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/lock_shared.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/lock_shared.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/try_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/try_lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/try_lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/try_lock.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/try_lock_shared.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/try_lock_shared.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/try_lock_shared.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/try_lock_shared.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.compile.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.compile.fail.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.compile.fail.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.compile.fail.cpp @@ -9,9 +9,9 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.compile.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.compile.fail.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.compile.fail.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.compile.fail.cpp @@ -9,9 +9,9 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/default.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/default.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/default.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/default.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock_shared.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock_shared.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock_shared.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/lock_shared.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_for.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_for.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_for.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_for.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_for.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_for.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_for.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_for.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_until.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_until.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_until.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_shared_until.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until.pass.cpp @@ -12,9 +12,9 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until_deadlock_bug.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until_deadlock_bug.pass.cpp --- a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until_deadlock_bug.pass.cpp +++ b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/try_lock_until_deadlock_bug.pass.cpp @@ -10,9 +10,9 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.semaphore/acquire.pass.cpp b/libcxx/test/std/thread/thread.semaphore/acquire.pass.cpp --- a/libcxx/test/std/thread/thread.semaphore/acquire.pass.cpp +++ b/libcxx/test/std/thread/thread.semaphore/acquire.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.semaphore/binary.pass.cpp b/libcxx/test/std/thread/thread.semaphore/binary.pass.cpp --- a/libcxx/test/std/thread/thread.semaphore/binary.pass.cpp +++ b/libcxx/test/std/thread/thread.semaphore/binary.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.semaphore/release.pass.cpp b/libcxx/test/std/thread/thread.semaphore/release.pass.cpp --- a/libcxx/test/std/thread/thread.semaphore/release.pass.cpp +++ b/libcxx/test/std/thread/thread.semaphore/release.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.semaphore/timed.pass.cpp b/libcxx/test/std/thread/thread.semaphore/timed.pass.cpp --- a/libcxx/test/std/thread/thread.semaphore/timed.pass.cpp +++ b/libcxx/test/std/thread/thread.semaphore/timed.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/thread/thread.semaphore/try_acquire.pass.cpp b/libcxx/test/std/thread/thread.semaphore/try_acquire.pass.cpp --- a/libcxx/test/std/thread/thread.semaphore/try_acquire.pass.cpp +++ b/libcxx/test/std/thread/thread.semaphore/try_acquire.pass.cpp @@ -11,14 +11,14 @@ // This test requires the dylib support introduced in D68480, // which hasn't shipped yet. -// XFAIL: with_system_cxx_lib=macosx -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/const_correctness.fail.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/not_copy_constructible.fail.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.roundtrip.pass.cpp b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.roundtrip.pass.cpp --- a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.roundtrip.pass.cpp +++ b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.roundtrip.pass.cpp @@ -13,12 +13,12 @@ // The roundtrip test uses to_chars, which requires functions in the dylib // that were introduced in Mac OS 10.15. // -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp b/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp --- a/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp +++ b/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.pass.cpp @@ -12,12 +12,12 @@ // to_chars requires functions in the dylib that were introduced in Mac OS 10.15. // -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/format/format.error/format.error.pass.cpp b/libcxx/test/std/utilities/format/format.error/format.error.pass.cpp --- a/libcxx/test/std/utilities/format/format.error/format.error.pass.cpp +++ b/libcxx/test/std/utilities/format/format.error/format.error.pass.cpp @@ -9,13 +9,13 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17 // This test requires the dylib support introduced in D92214. -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/check_arg_id.pass.cpp b/libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/check_arg_id.pass.cpp --- a/libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/check_arg_id.pass.cpp +++ b/libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/check_arg_id.pass.cpp @@ -10,13 +10,13 @@ // UNSUPPORTED: no-exceptions // This test requires the dylib support introduced in D92214. -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/next_arg_id.pass.cpp b/libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/next_arg_id.pass.cpp --- a/libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/next_arg_id.pass.cpp +++ b/libcxx/test/std/utilities/format/format.formatter/format.parse.ctx/next_arg_id.pass.cpp @@ -10,13 +10,13 @@ // UNSUPPORTED: no-exceptions // This test requires the dylib support introduced in D92214. -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp b/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp --- a/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp +++ b/libcxx/test/std/utilities/memory/temporary.buffer/overaligned.pass.cpp @@ -11,10 +11,10 @@ // Aligned allocations are not supported on macOS < 10.13 // Note: use 'unsupported' instead of 'xfail' to ensure // we won't pass prior to c++17. -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp b/libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.bad_optional_access/default.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp b/libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.bad_optional_access/derive.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp @@ -10,10 +10,10 @@ // // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // constexpr T& optional::value() &&; diff --git a/libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp b/libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp @@ -9,10 +9,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // // diff --git a/libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp b/libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp --- a/libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp +++ b/libcxx/test/std/utilities/time/time.clock/time.clock.file/now.pass.cpp @@ -10,12 +10,12 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// UNSUPPORTED: with_system_cxx_lib=macosx10.14 -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.14 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp b/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.bad_variant_access/bad_variant_access.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // diff --git a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.visit/robust_against_adl.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/robust_against_adl.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.visit/robust_against_adl.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.visit/robust_against_adl.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // // template diff --git a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // // template diff --git a/libcxx/test/std/utilities/variant/variant.visit/visit_return_type.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/visit_return_type.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.visit/visit_return_type.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.visit/visit_return_type.pass.cpp @@ -10,10 +10,10 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17 // Throwing bad_variant_access is supported starting in macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.11 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.10 && !no-exceptions -// XFAIL: with_system_cxx_lib=macosx10.9 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 && !no-exceptions +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 && !no-exceptions // // template diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -119,7 +119,6 @@ self.target_info = make_target_info(self) self.executor = self.get_lit_conf('executor') self.configure_cxx() - self.configure_triple() self.configure_src_root() self.configure_obj_root() self.cxx_stdlib_under_test = self.get_lit_conf('cxx_stdlib_under_test', 'libc++') @@ -247,21 +246,6 @@ # using this feature. (Also see llvm.org/PR32730) self.config.available_features.add('LIBCXX-WINDOWS-FIXME') - target_triple = getattr(self.config, 'target_triple', None) - if target_triple: - if re.match(r'^x86_64.*-apple', target_triple): - self.config.available_features.add('x86_64-apple') - if re.match(r'^x86_64.*-linux', target_triple): - self.config.available_features.add('x86_64-linux') - if re.match(r'^i.86.*', target_triple): - self.config.available_features.add('target-x86') - elif re.match(r'^x86_64.*', target_triple): - self.config.available_features.add('target-x86_64') - elif re.match(r'^aarch64.*', target_triple): - self.config.available_features.add('target-aarch64') - elif re.match(r'^arm.*', target_triple): - self.config.available_features.add('target-arm') - def configure_compile_flags(self): self.configure_default_compile_flags() # Configure extra flags @@ -306,9 +290,6 @@ # being elided. if self.target_info.is_windows() and self.debug_build: self.cxx.compile_flags += ['-D_DEBUG'] - if not self.cxx.addFlagIfSupported(['--target=' + self.config.target_triple]): - self.lit_config.warning('Not adding any target triple -- the compiler does ' - 'not support --target=') # Add includes for support headers used in the tests. support_path = os.path.join(self.libcxx_src_root, 'test/support') @@ -356,10 +337,11 @@ self.lit_config.fatal("cxx_headers='{}' is not a directory.".format(cxx_headers)) (path, version) = os.path.split(cxx_headers) (path, cxx) = os.path.split(path) - cxx_target_headers = os.path.join( - path, self.get_lit_conf('target_triple', None), cxx, version) - if os.path.isdir(cxx_target_headers): - self.cxx.compile_flags += ['-I' + cxx_target_headers] + triple = self.get_lit_conf('target_triple', None) + if triple is not None: + cxx_target_headers = os.path.join(path, triple, cxx, version) + if os.path.isdir(cxx_target_headers): + self.cxx.compile_flags += ['-I' + cxx_target_headers] self.cxx.compile_flags += ['-I' + cxx_headers] if self.libcxx_obj_root is not None: cxxabi_headers = os.path.join(self.libcxx_obj_root, 'include', @@ -591,34 +573,6 @@ ] sub.append(('%{exec}', '{} {} -- '.format(self.executor, ' '.join(exec_args)))) - def configure_triple(self): - # Get or infer the target triple. - target_triple = self.get_lit_conf('target_triple') - - # If no target triple was given, try to infer it from the compiler - # under test. - if not target_triple: - self.lit_config.note('Trying to infer the target_triple because none was specified') - - target_triple = self.cxx.getTriple() - # Drop sub-major version components from the triple, because the - # current XFAIL handling expects exact matches for feature checks. - # Example: x86_64-apple-darwin14.0.0 -> x86_64-apple-darwin14 - # The 5th group handles triples greater than 3 parts - # (ex x86_64-pc-linux-gnu). - target_triple = re.sub(r'([^-]+)-([^-]+)-([^.]+)([^-]*)(.*)', - r'\1-\2-\3\5', target_triple) - # linux-gnu is needed in the triple to properly identify linuxes - # that use GLIBC. Handle redhat and opensuse triples as special - # cases and append the missing `-gnu` portion. - if (target_triple.endswith('redhat-linux') or - target_triple.endswith('suse-linux')): - target_triple += '-gnu' - - # Save the triple - self.lit_config.note("Setting target_triple to {}".format(target_triple)) - self.config.target_triple = target_triple - def configure_env(self): self.config.environment = dict(os.environ) diff --git a/libcxx/utils/libcxx/test/dsl.py b/libcxx/utils/libcxx/test/dsl.py --- a/libcxx/utils/libcxx/test/dsl.py +++ b/libcxx/utils/libcxx/test/dsl.py @@ -210,6 +210,21 @@ allMacros = compilerMacros(config, flags) return {m: int(v.rstrip('LlUu')) for (m, v) in allMacros.items() if m.startswith('__cpp_')} +@_memoizeExpensiveOperation(lambda c: (c.substitutions, c.environment)) +def getHostTriple(config): + """ + Returns the default triple of the compiler. + + TODO: This shouldn't be necessary here - ideally the user would always pass + the triple as a parameter. This is done to support the legacy standalone + builds, which don't set the triple. + """ + with _makeConfigTest(config) as test: + unparsedOutput, err, exitCode, timeoutInfo = _executeScriptInternal(test, [ + "%{cxx} %{flags} %{compile_flags} -dumpmachine" + ]) + output = re.search(r"# command output:\n(.+)\n", unparsedOutput).group(1) + return output def _appendToSubstitution(substitutions, key, value): return [(k, v + ' ' + value) if k == key else (k, v) for (k, v) in substitutions] @@ -294,6 +309,26 @@ return 'add {} to %{{flags}}'.format(self._getFlag(config)) +class AddFlagIfSupported(ConfigAction): + """ + This action adds the given flag to the %{flags} substitution, only if + the compiler supports the flag. + + The flag can be a string or a callable, in which case it is called with the + configuration to produce the actual flag (as a string). + """ + def __init__(self, flag): + self._getFlag = lambda config: flag(config) if callable(flag) else flag + + def applyTo(self, config): + flag = self._getFlag(config) + if hasCompileFlag(config, flag): + config.substitutions = _appendToSubstitution(config.substitutions, '%{flags}', flag) + + def pretty(self, config, litParams): + return 'add {} to %{{flags}}'.format(self._getFlag(config)) + + class AddCompileFlag(ConfigAction): """ This action adds the given flag to the %{compile_flags} substitution. @@ -500,19 +535,8 @@ if some actions are not supported in the given configuration. For example, trying to set the compilation standard to C++23 when `-std=c++23` is not supported by the compiler would be an error. - - One important point is that Parameters customize the behavior of the test - suite in a bounded way, i.e. there should be a finite set of possible choices - for ``. While this may appear to be an aggressive restriction, this - is actually a very important constraint that ensures that the set of - configurations supported by a test suite is finite. Otherwise, a test - suite could have an unbounded number of supported configurations, and - nobody wants to be stuck maintaining that. If it's not possible for an - option to have a finite set of possible values (e.g. the path to the - compiler), it can be handled in the `lit.cfg`, but it shouldn't be - represented with a Parameter. - """ - def __init__(self, name, choices, type, help, actions, default=None): + """ + def __init__(self, name, type, help, actions, choices=None, default=None): """ Create a Lit parameter to customize the behavior of a test suite. @@ -522,10 +546,10 @@ when running Lit. This must be non-empty. - choices - A non-empty set of possible values for this parameter. This must be - anything that can be iterated. It is an error if the parameter is - given a value that is not in that set, whether explicitly or through - a default value. + An optional non-empty set of possible values for this parameter. If provided, + this must be anything that can be iterated. It is an error if the parameter + is given a value that is not in that set, whether explicitly or through a + default value. - type A callable that can be used to parse the value of the parameter given @@ -553,9 +577,12 @@ if len(self._name) == 0: raise ValueError("Parameter name must not be the empty string") - self._choices = list(choices) # should be finite - if len(self._choices) == 0: - raise ValueError("Parameter '{}' must be given at least one possible value".format(self._name)) + if choices is not None: + self._choices = list(choices) # should be finite + if len(self._choices) == 0: + raise ValueError("Parameter '{}' must be given at least one possible value".format(self._name)) + else: + self._choices = None self._parse = lambda x: (_str_to_bool(x) if type is bool and isinstance(x, str) else type(x)) @@ -573,7 +600,7 @@ raise ValueError("Parameter {} doesn't have a default value, but it was not specified in the Lit parameters or in the Lit config".format(self.name)) getDefault = lambda: self._default(config) if callable(self._default) else self._default value = self._parse(param) if param is not None else getDefault() - if value not in self._choices: + if self._choices and value not in self._choices: raise ValueError("Got value '{}' for parameter '{}', which is not in the provided set of possible choices: {}".format(value, self.name, self._choices)) return value diff --git a/libcxx/utils/libcxx/test/features.py b/libcxx/utils/libcxx/test/features.py --- a/libcxx/utils/libcxx/test/features.py +++ b/libcxx/utils/libcxx/test/features.py @@ -167,50 +167,3 @@ actions=[AddSubstitution('%{gdb}', lambda cfg: shutil.which('gdb'))] ) ] - - -# When vendor-specific availability annotations are enabled, add Lit features -# with various forms of the target triple to make it easier to write XFAIL or -# UNSUPPORTED markup for tests that are known to fail on a particular triple. -# -# More specifically, when the `use_system_cxx_lib` parameter is enabled, then -# assuming the `target_triple` is set to `x86_64-apple-macosx10.12`, the -# following features will be made available: -# - with_system_cxx_lib=macosx -# - with_system_cxx_lib=macosx10.12 -# - with_system_cxx_lib=x86_64-apple-macosx10.12 -# -# These features can be used to XFAIL a test that fails when deployed on (or is -# compiled for) an older system. For example, if the test exhibits a bug in the -# libc on a particular system version, or if the test uses a symbol that is not -# available on an older version of the dylib, it can be marked as XFAIL with -# one of the above features. -# -# It is sometimes useful to check that a test fails specifically when compiled -# for a given deployment target. For example, this is the case when testing -# availability markup, where we want to make sure that using the annotated -# facility on a deployment target that doesn't support it will fail at compile -# time, not at runtime. This can be achieved by creating a `.compile.pass.cpp` -# and XFAILing it for the right deployment target. If the test doesn't fail at -# compile-time like it's supposed to, the test will XPASS. Another option is to -# create a `.verify.cpp` test that checks for the right errors, and mark that -# test as requiring `with_system_cxx_lib=`. -# -# TODO: This is very unclean -- we assume that the 'use_system_cxx_lib' parameter -# is set before this feature gets detected, and we also set a dummy name -# for the main feature. We also take for granted that `target_triple` -# exists in the config object. This should be refactored so that the -# 'use_system_cxx_lib' Parameter can set these features itself. -def _addSystemCxxLibDeclinations(cfg): - (arch, vendor, platform) = cfg.target_triple.split('-', 2) - (sysname, version) = re.match(r'([^0-9]+)([0-9\.]*)', platform).groups() - return [ - AddFeature('with_system_cxx_lib={}-{}-{}{}'.format(arch, vendor, sysname, version)), - AddFeature('with_system_cxx_lib={}{}'.format(sysname, version)), - AddFeature('with_system_cxx_lib={}'.format(sysname)), - ] -DEFAULT_FEATURES += [ - Feature(name='__dummy_use_system_cxx_lib', - when=lambda cfg: 'use_system_cxx_lib' in cfg.available_features, - actions=_addSystemCxxLibDeclinations) -] 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 @@ -54,6 +54,21 @@ DEFAULT_PARAMETERS = [ # Core parameters of the test suite + Parameter(name='target_triple', type=str, default=getHostTriple, + help="The target triple to compile the test suite for. This must be " + "compatible with the target that the tests will be run on.", + actions=lambda triple: filter(None, [ + AddFeature(triple), + AddFlagIfSupported('--target={}'.format(triple)), + AddFeature('linux-gnu') if re.match(r'^.*-linux-gnu', triple) else None, + AddFeature('x86_64-linux') if re.match(r'^x86_64.*-linux', triple) else None, + AddFeature('x86_64-apple') if re.match(r'^x86_64.*-apple', triple) else None, + AddFeature('target-x86') if re.match(r'^i.86.*', triple) else None, + AddFeature('target-x86_64') if re.match(r'^x86_64.*', triple) else None, + AddFeature('target-aarch64') if re.match(r'^aarch64.*', triple) else None, + AddFeature('target-arm') if re.match(r'^arm.*', triple) else None, + ])), + Parameter(name='std', choices=_allStandards, type=str, help="The version of the standard to compile the test suite with.", default=lambda cfg: next(s for s in reversed(_allStandards) if getStdFlag(cfg, s)), @@ -88,18 +103,6 @@ AddOptionalWarningFlag(w) for w in _warningFlags ]), - Parameter(name='use_system_cxx_lib', choices=[True, False], type=bool, default=False, - help="Whether the test suite is being *run* against the library shipped on " - "the target triple in use, as opposed to the trunk library.", - actions=lambda useSystem: [ - # TODO: Remove this, see comment in features.py - AddFeature('use_system_cxx_lib') - ] if useSystem else [ - # If we're testing upstream libc++, disable availability markup, - # which is not relevant for non-shipped flavors of libc++. - AddCompileFlag('-D_LIBCPP_DISABLE_AVAILABILITY') - ]), - Parameter(name='debug_level', choices=['', '0', '1'], type=str, default='', help="The debugging level to enable in the test suite.", actions=lambda debugLevel: [] if debugLevel == '' else [ @@ -132,3 +135,38 @@ AddFeature('libcxx-no-debug-mode') ]), ] + +DEFAULT_PARAMETERS += [ + Parameter(name='use_system_cxx_lib', choices=[True, False], type=bool, default=False, + help=""" + Whether the test suite is being *run* against the library shipped on the + target triple in use, as opposed to the trunk library. + + When vendor-specific availability annotations are enabled, we add the + 'use_system_cxx_lib' Lit feature to allow writing XFAIL or UNSUPPORTED + markup for tests that are known to fail on a particular triple. + + That feature can be used to XFAIL a test that fails when deployed on (or is + compiled for) an older system. For example, if the test exhibits a bug in the + libc on a particular system version, or if the test uses a symbol that is not + available on an older version of the dylib, it can be marked as XFAIL with + the above feature. + + It is sometimes useful to check that a test fails specifically when compiled + for a given deployment target. For example, this is the case when testing + availability markup, where we want to make sure that using the annotated + facility on a deployment target that doesn't support it will fail at compile + time, not at runtime. This can be achieved by creating a `.compile.pass.cpp` + and XFAILing it for the right deployment target. If the test doesn't fail at + compile-time like it's supposed to, the test will XPASS. Another option is to + create a `.verify.cpp` test that checks for the right errors, and mark that + test as requiring `use_system_cxx_lib && `. + """, + actions=lambda useSystem: [ + AddFeature('use_system_cxx_lib') + ] if useSystem else [ + # If we're testing upstream libc++, disable availability markup, + # which is not relevant for non-shipped flavors of libc++. + AddCompileFlag('-D_LIBCPP_DISABLE_AVAILABILITY') + ]) +] diff --git a/libcxxabi/test/catch_function_01.pass.cpp b/libcxxabi/test/catch_function_01.pass.cpp --- a/libcxxabi/test/catch_function_01.pass.cpp +++ b/libcxxabi/test/catch_function_01.pass.cpp @@ -14,8 +14,8 @@ // UNSUPPORTED: no-exceptions // 65ace9daa360 made it in the dylib in macOS 10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include diff --git a/libcxxabi/test/catch_member_data_pointer_01.pass.cpp b/libcxxabi/test/catch_member_data_pointer_01.pass.cpp --- a/libcxxabi/test/catch_member_data_pointer_01.pass.cpp +++ b/libcxxabi/test/catch_member_data_pointer_01.pass.cpp @@ -9,8 +9,8 @@ // UNSUPPORTED: no-exceptions // 1b00fc5d8133 made it in the dylib in macOS 10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include diff --git a/libcxxabi/test/catch_member_pointer_nullptr.pass.cpp b/libcxxabi/test/catch_member_pointer_nullptr.pass.cpp --- a/libcxxabi/test/catch_member_pointer_nullptr.pass.cpp +++ b/libcxxabi/test/catch_member_pointer_nullptr.pass.cpp @@ -8,10 +8,10 @@ // Catching an exception thrown as nullptr was not properly handled before // 2f984cab4fa7, which landed in macOS 10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // UNSUPPORTED: no-exceptions diff --git a/libcxxabi/test/catch_multi_level_pointer.pass.cpp b/libcxxabi/test/catch_multi_level_pointer.pass.cpp --- a/libcxxabi/test/catch_multi_level_pointer.pass.cpp +++ b/libcxxabi/test/catch_multi_level_pointer.pass.cpp @@ -9,8 +9,8 @@ // UNSUPPORTED: no-exceptions // 1b00fc5d8133 made it in the dylib in macOS 10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include #include diff --git a/libcxxabi/test/catch_pointer_nullptr.pass.cpp b/libcxxabi/test/catch_pointer_nullptr.pass.cpp --- a/libcxxabi/test/catch_pointer_nullptr.pass.cpp +++ b/libcxxabi/test/catch_pointer_nullptr.pass.cpp @@ -8,10 +8,10 @@ // Catching an exception thrown as nullptr was not properly handled before // 2f984cab4fa7, which landed in macOS 10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // UNSUPPORTED: c++03 // UNSUPPORTED: no-exceptions diff --git a/libcxxabi/test/catch_ptr_02.pass.cpp b/libcxxabi/test/catch_ptr_02.pass.cpp --- a/libcxxabi/test/catch_ptr_02.pass.cpp +++ b/libcxxabi/test/catch_ptr_02.pass.cpp @@ -15,7 +15,7 @@ // ADDITIONAL_COMPILE_FLAGS: -Wno-error // The fix for PR17222 made it in the dylib for macOS 10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include diff --git a/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp b/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp --- a/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp +++ b/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp @@ -9,12 +9,12 @@ // UNSUPPORTED: no-exceptions // PR41395 isn't fixed until the dylib shipped with macOS 10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include "cxxabi.h" #include diff --git a/libcxxabi/test/dynamic_cast.pass.cpp b/libcxxabi/test/dynamic_cast.pass.cpp --- a/libcxxabi/test/dynamic_cast.pass.cpp +++ b/libcxxabi/test/dynamic_cast.pass.cpp @@ -9,14 +9,14 @@ // XFAIL: gcc-7, gcc-8, gcc-9 // PR33425 and PR33487 are not fixed until the dylib shipped with macOS 10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 // PR33439 isn't fixed until the dylib shipped with macOS 10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include diff --git a/libcxxabi/test/exception_object_alignment.pass.cpp b/libcxxabi/test/exception_object_alignment.pass.cpp --- a/libcxxabi/test/exception_object_alignment.pass.cpp +++ b/libcxxabi/test/exception_object_alignment.pass.cpp @@ -12,11 +12,11 @@ // before macOS 10.14. The test fails on macOS 10.9 to 10.12, passes on macOS // 10.13 (no investigation done), and passes afterwards. Just mark all the OSes // before 10.14 as unsupported. -// UNSUPPORTED: with_system_cxx_lib=macosx10.13 -// UNSUPPORTED: with_system_cxx_lib=macosx10.12 -// UNSUPPORTED: with_system_cxx_lib=macosx10.11 -// UNSUPPORTED: with_system_cxx_lib=macosx10.10 -// UNSUPPORTED: with_system_cxx_lib=macosx10.9 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.13 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10 +// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9 // Check that the pointer __cxa_allocate_exception returns is aligned to the // default alignment for the target architecture. diff --git a/libcxxabi/test/forced_unwind1.pass.cpp b/libcxxabi/test/forced_unwind1.pass.cpp --- a/libcxxabi/test/forced_unwind1.pass.cpp +++ b/libcxxabi/test/forced_unwind1.pass.cpp @@ -12,13 +12,13 @@ // UNSUPPORTED: no-exceptions, c++03 // These tests fail on previously released dylibs, investigation needed. -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include #include diff --git a/libcxxabi/test/forced_unwind2.pass.cpp b/libcxxabi/test/forced_unwind2.pass.cpp --- a/libcxxabi/test/forced_unwind2.pass.cpp +++ b/libcxxabi/test/forced_unwind2.pass.cpp @@ -11,13 +11,13 @@ // UNSUPPORTED: no-exceptions, c++03 // These tests fail on previously released dylibs, investigation needed. -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include #include diff --git a/libcxxabi/test/incomplete_type.sh.cpp b/libcxxabi/test/incomplete_type.sh.cpp --- a/libcxxabi/test/incomplete_type.sh.cpp +++ b/libcxxabi/test/incomplete_type.sh.cpp @@ -17,10 +17,10 @@ // UNSUPPORTED: no-rtti // The fix for PR25898 landed in the system dylibs in macOS 10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // RUN: %{cxx} %{flags} %{compile_flags} -Wno-unreachable-code -c %s -o %t.one.o // RUN: %{cxx} %{flags} %{compile_flags} -Wno-unreachable-code -c %s -o %t.two.o -DTU_ONE diff --git a/libcxxabi/test/libcxxabi/test/config.py b/libcxxabi/test/libcxxabi/test/config.py --- a/libcxxabi/test/libcxxabi/test/config.py +++ b/libcxxabi/test/libcxxabi/test/config.py @@ -71,10 +71,11 @@ % cxx_headers) (path, version) = os.path.split(cxx_headers) (path, cxx) = os.path.split(path) - cxx_target_headers = os.path.join( - path, self.get_lit_conf('target_triple', None), cxx, version) - if os.path.isdir(cxx_target_headers): - self.cxx.compile_flags += ['-I' + cxx_target_headers] + triple = self.get_lit_conf('target_triple', None) + if triple is not None: + cxx_target_headers = os.path.join(path, triple, cxx, version) + if os.path.isdir(cxx_target_headers): + self.cxx.compile_flags += ['-I' + cxx_target_headers] self.cxx.compile_flags += ['-I' + cxx_headers] libcxxabi_headers = self.get_lit_conf( diff --git a/libcxxabi/test/lit.site.cfg.in b/libcxxabi/test/lit.site.cfg.in --- a/libcxxabi/test/lit.site.cfg.in +++ b/libcxxabi/test/lit.site.cfg.in @@ -25,7 +25,8 @@ config.enable_shared = @LIBCXXABI_LINK_TESTS_WITH_SHARED_LIBCXX@ config.enable_exceptions = @LIBCXXABI_ENABLE_EXCEPTIONS@ config.host_triple = "@LLVM_HOST_TRIPLE@" -config.target_triple = "@TARGET_TRIPLE@" +if "@TARGET_TRIPLE@": + config.target_triple = "@TARGET_TRIPLE@" config.sysroot = "@LIBCXXABI_SYSROOT@" config.gcc_toolchain = "@LIBCXXABI_GCC_TOOLCHAIN@" config.cxx_ext_threads = @LIBCXXABI_BUILD_EXTERNAL_THREAD_LIBRARY@ diff --git a/libcxxabi/test/native/arm-linux-eabi/lit.local.cfg b/libcxxabi/test/native/arm-linux-eabi/lit.local.cfg --- a/libcxxabi/test/native/arm-linux-eabi/lit.local.cfg +++ b/libcxxabi/test/native/arm-linux-eabi/lit.local.cfg @@ -1,6 +1,6 @@ def is_arm_linux_eabi(triple): return ('arm' in triple) and ('linux' in triple) and ('eabi' in triple) -is_native = config.root.host_triple == config.root.target_triple +is_native = hasattr(config.root, 'target_triple') and (config.root.host_triple == config.root.target_triple) if not is_native or not is_arm_linux_eabi(config.root.host_triple): config.unsupported = True diff --git a/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp b/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp --- a/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp +++ b/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp @@ -10,12 +10,12 @@ // ___cxa_throw_bad_array_new_length is re-exported from libc++ only starting // in macosx 10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include #include diff --git a/libcxxabi/test/test_demangle.pass.cpp b/libcxxabi/test/test_demangle.pass.cpp --- a/libcxxabi/test/test_demangle.pass.cpp +++ b/libcxxabi/test/test_demangle.pass.cpp @@ -7,13 +7,13 @@ //===----------------------------------------------------------------------===// // The demangler does not pass all these tests with the system dylibs on macOS. -// XFAIL: with_system_cxx_lib=macosx10.15 -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include "support/timer.h" #include diff --git a/libcxxabi/test/test_exception_address_alignment.pass.cpp b/libcxxabi/test/test_exception_address_alignment.pass.cpp --- a/libcxxabi/test/test_exception_address_alignment.pass.cpp +++ b/libcxxabi/test/test_exception_address_alignment.pass.cpp @@ -17,10 +17,10 @@ // XFAIL: apple-clang-11 && !target-arm // XFAIL: apple-clang-10 && !target-arm // XFAIL: apple-clang-9 && !target-arm -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 // Test that the address of the exception object is properly aligned as required // by the relevant ABI diff --git a/libcxxabi/test/uncaught_exceptions.pass.cpp b/libcxxabi/test/uncaught_exceptions.pass.cpp --- a/libcxxabi/test/uncaught_exceptions.pass.cpp +++ b/libcxxabi/test/uncaught_exceptions.pass.cpp @@ -9,12 +9,12 @@ // UNSUPPORTED: no-exceptions // __cxa_uncaught_exceptions is not re-exported from libc++ until macOS 10.15. -// XFAIL: with_system_cxx_lib=macosx10.14 -// XFAIL: with_system_cxx_lib=macosx10.13 -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 +// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 #include #include diff --git a/libunwind/test/lit.site.cfg.in b/libunwind/test/lit.site.cfg.in --- a/libunwind/test/lit.site.cfg.in +++ b/libunwind/test/lit.site.cfg.in @@ -24,7 +24,8 @@ config.enable_shared = @LIBCXX_ENABLE_SHARED@ config.arm_ehabi = @LIBUNWIND_USES_ARM_EHABI@ config.host_triple = "@LLVM_HOST_TRIPLE@" -config.target_triple = "@TARGET_TRIPLE@" +if "@TARGET_TRIPLE@": + config.target_triple = "@TARGET_TRIPLE@" config.sysroot = "@LIBUNWIND_SYSROOT@" config.gcc_toolchain = "@LIBUNWIND_GCC_TOOLCHAIN@" config.cxx_ext_threads = @LIBUNWIND_BUILD_EXTERNAL_THREAD_LIBRARY@