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,7 @@ // Test exporting the symbol: "__cxa_deleted_virtual" in macosx // But don't expect the symbol to be exported in previous versions. // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} 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,7 @@ // UNSUPPORTED: apple-clang-9, apple-clang-10 // UNSUPPORTED: clang-5, clang-6, clang-7 -// 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) +// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} #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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // GCC 5 doesn't support aligned allocation // UNSUPPORTED: gcc-5 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} #include 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,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// 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) +// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // Test the availability markup on the C++20 Synchronization Library 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,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// 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) +// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|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,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// 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) +// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|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,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03, c++11 -// 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) +// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|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,7 @@ // UNSUPPORTED: c++03 // PR30202 was fixed starting in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // 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: 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // Until 58a0a70fb2f1, this_thread::sleep_for misbehaves when interrupted by // a signal, as tested here. Disable the test on the corresponding system // libraries. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03 -// 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: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|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,13 +12,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ //===----------------------------------------------------------------------===// // XFAIL: suse-linux-enterprise-server-11 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // const error_category& system_category(); // XFAIL: suse-linux-enterprise-server-11 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} #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,7 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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 @@ -10,7 +10,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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 @@ -10,7 +10,7 @@ // The string reported on errors changed, which makes those tests fail when run // against already-released libc++'s. -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.15 +// XFAIL: use_system_cxx_lib && target={{.+}}-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 @@ -3,7 +3,7 @@ # suite against an older macOS. too_old = {'10.9', '10.10', '10.11', '10.12', '10.13', '10.14'} 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): + if any('target=x86_64-apple-macosx{}'.format(v) in config.available_features for v in too_old): config.unsupported = True if 'libcpp-has-no-filesystem-library' in config.available_features: 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // //===----------------------------------------------------------------------===// -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // 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: 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 && target={{.+}}-apple-macosx10.{{12|13|14}} #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: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && target={{.+}}-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,7 @@ // The dylibs shipped on macOS so far do not contain the fix for PR43300, so // this test fails. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // when sized deallocation is not supported, e.g., prior to C++14. // UNSUPPORTED: sanitizer-new-delete -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // when sized deallocation is not supported, e.g., prior to C++14. // UNSUPPORTED: sanitizer-new-delete -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,11 @@ // UNSUPPORTED: no-exceptions // std::uncaught_exceptions() was introduced in the dylib on Mac OS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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: use_system_cxx_lib && x86_64-apple-macosx10.13 -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{12|13}} // test uncaught_exceptions diff --git a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.collate/locale.collate.byname/compare.pass.cpp @@ -20,9 +20,8 @@ // up the OS's collation files. // TODO investigation needed. -// Glibc seems to collate files differently from the way Apple's C library does -// it. -// XFAIL: linux-gnu +// Glibc seems to collate files differently from the way Apple's C library does it. +// XFAIL: target={{.*}}-linux-gnu{{.*}} // XFAIL: LIBCXX-WINDOWS-FIXME 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.get/locale.money.get.members/get_long_double_zh_CN.pass.cpp @@ -21,7 +21,7 @@ // ios_base::iostate& err, long double& v) const; // TODO For zh_CN GLIBC puts the negative sign after the currency symbol. -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} #include #include diff --git a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.monetary/locale.money.put/locale.money.put.members/put_long_double_zh_CN.pass.cpp @@ -21,7 +21,7 @@ // long double units) const; // TODO For zh_CN GLIBC puts the negative sign after the currency symbol. -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} #include #include diff --git a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.numeric/locale.nm.put/facet.num.put.members/put_long_double.pass.cpp @@ -13,7 +13,7 @@ // iter_type put(iter_type s, ios_base& iob, char_type fill, long double v) const; // TODO GLIBC uses a different string for positive and negative NAN numbers. -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} // XFAIL: LIBCXX-WINDOWS-FIXME 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,7 @@ // This test exercises the fix for PR28704, which isn't in the dylib for // some systems. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} #include #include diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one.pass.cpp @@ -24,7 +24,7 @@ // ios_base::iostate& err, tm *t, char format, char modifier = 0) const; // TODO: investigation needed -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} #include #include diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_one_wide.pass.cpp @@ -24,7 +24,7 @@ // ios_base::iostate& err, tm *t, char format, char modifier = 0) const; // TODO: investigation needed -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} #include #include diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday.pass.cpp @@ -22,7 +22,7 @@ // ios_base::iostate& err, tm* t) const; // TODO: investigation needed -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} #include #include diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.get.byname/get_weekday_wide.pass.cpp @@ -20,7 +20,7 @@ // ios_base::iostate& err, tm* t) const; // TODO: investigation needed -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} #include #include diff --git a/libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp b/libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp --- a/libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp +++ b/libcxx/test/std/localization/locale.categories/category.time/locale.time.put.byname/put1.pass.cpp @@ -29,7 +29,7 @@ // }; // TODO: investigation needed -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} #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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // This test relies on P0482 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // See bugs.llvm.org/PR20183 // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // See bugs.llvm.org/PR20183 // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // UNSUPPORTED: libcpp-has-no-random-device diff --git a/libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/awk.locale.pass.cpp @@ -18,7 +18,7 @@ // TODO: investigation needed // TODO(netbsd): incomplete support for locales -// XFAIL: linux-gnu, netbsd, freebsd +// XFAIL: target={{.*}}-linux-gnu{{.*}}, netbsd, freebsd // REQUIRES: locale.cs_CZ.ISO8859-2 #include diff --git a/libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/basic.locale.pass.cpp @@ -21,7 +21,7 @@ // regex_constants::match_flag_type flags = regex_constants::match_default); // TODO: investigation needed -// XFAIL: linux-gnu, freebsd +// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd #include #include diff --git a/libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/ecma.locale.pass.cpp @@ -21,7 +21,7 @@ // regex_constants::match_flag_type flags = regex_constants::match_default); // TODO: investigation needed -// XFAIL: linux-gnu, freebsd +// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd #include #include diff --git a/libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/extended.locale.pass.cpp @@ -21,7 +21,7 @@ // regex_constants::match_flag_type flags = regex_constants::match_default); // TODO: investigation needed -// XFAIL: linux-gnu, freebsd +// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd #include #include diff --git a/libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/awk.locale.pass.cpp @@ -21,7 +21,7 @@ // regex_constants::match_flag_type flags = regex_constants::match_default); // TODO: investigation needed -// XFAIL: linux-gnu, freebsd +// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd #include #include diff --git a/libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/basic.locale.pass.cpp @@ -21,7 +21,7 @@ // regex_constants::match_flag_type flags = regex_constants::match_default); // TODO: investigation needed -// XFAIL: linux-gnu, freebsd +// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd #include #include diff --git a/libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/ecma.locale.pass.cpp @@ -21,7 +21,7 @@ // regex_constants::match_flag_type flags = regex_constants::match_default); // TODO: investigation needed -// XFAIL: linux-gnu, freebsd +// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd #include #include diff --git a/libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/extended.locale.pass.cpp @@ -21,7 +21,7 @@ // regex_constants::match_flag_type flags = regex_constants::match_default); // TODO: investigation needed -// XFAIL: linux-gnu, freebsd +// XFAIL: target={{.*}}-linux-gnu{{.*}}, freebsd #include #include diff --git a/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp b/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp --- a/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp +++ b/libcxx/test/std/re/re.traits/lookup_collatename.pass.cpp @@ -20,7 +20,7 @@ // lookup_collatename(ForwardIterator first, ForwardIterator last) const; // TODO: investigation needed -// XFAIL: linux-gnu +// XFAIL: target={{.*}}-linux-gnu{{.*}} #include #include 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,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: no-exceptions -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // This test relies on https://llvm.org/PR45368 being fixed, which isn't in // older Apple dylibs // -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} #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,7 @@ // 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: 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // 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: 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // dylib support for shared_mutex was added in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // shared_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // shared_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // shared_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // ALLOW_RETRIES: 2 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,7 @@ // UNSUPPORTED: c++03, c++11 // shared_timed_mutex was introduced in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,13 +11,7 @@ // This test requires the dylib support introduced in D68480, which shipped in // macOS 11.0. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_any_cast is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // The roundtrip test uses to_chars, which requires functions in the dylib // that were introduced in Mac OS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // to_chars requires functions in the dylib that were introduced in Mac OS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17 // This test requires the dylib support introduced in D92214. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // UNSUPPORTED: no-exceptions // This test requires the dylib support introduced in D92214. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // UNSUPPORTED: no-exceptions // This test requires the dylib support introduced in D92214. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} // 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,7 @@ // 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: 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_optional_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: libcpp-has-no-filesystem-library // Filesystem is supported on Apple platforms starting with macosx10.15. -// 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !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,7 @@ // UNSUPPORTED: c++03, c++11, c++14, c++17 // Throwing bad_variant_access is supported starting in macosx10.13 -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} && !no-exceptions // // template 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 @@ -57,15 +57,8 @@ 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), + AddFeature('target={}'.format(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, 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,7 @@ // UNSUPPORTED: no-exceptions // 65ace9daa360 made it in the dylib in macOS 10.11 -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10}} #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,7 @@ // UNSUPPORTED: no-exceptions // 1b00fc5d8133 made it in the dylib in macOS 10.11 -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10}} #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,7 @@ // Catching an exception thrown as nullptr was not properly handled before // 2f984cab4fa7, which landed in macOS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: no-exceptions // 1b00fc5d8133 made it in the dylib in macOS 10.11 -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10 -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10}} #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,7 @@ // Catching an exception thrown as nullptr was not properly handled before // 2f984cab4fa7, which landed in macOS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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: use_system_cxx_lib && x86_64-apple-macosx10.9 +// XFAIL: use_system_cxx_lib && target={{.+}}-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,7 @@ // UNSUPPORTED: no-exceptions // PR41395 isn't fixed until the dylib shipped with macOS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} #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,10 @@ // XFAIL: gcc-7, gcc-8, gcc-9 // PR33425 and PR33487 are not fixed until the dylib shipped with macOS 10.15 -// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.14 // PR33439 isn't fixed until the dylib shipped with macOS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} #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,7 @@ // 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: 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 +// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}} // 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,7 @@ // UNSUPPORTED: no-exceptions, c++03 // These tests fail on previously released dylibs, investigation needed. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} #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,7 @@ // UNSUPPORTED: no-exceptions, c++03 // These tests fail on previously released dylibs, investigation needed. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} #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,7 @@ // UNSUPPORTED: no-rtti // The fix for PR25898 landed in the system dylibs in macOS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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/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,7 @@ // ___cxa_throw_bad_array_new_length is re-exported from libc++ only starting // in macosx 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} #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,7 @@ //===----------------------------------------------------------------------===// // The demangler does not pass all these tests with the system dylibs on macOS. -// 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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}} #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 @@ -13,14 +13,11 @@ // an incorrectly aligned _Unwind_Exception type on non-ARM. That causes these // tests to fail when compiling against such a SDK, or when running against a // system libc++abi that was compiled with an incorrect definition of _Unwind_Exception. -// XFAIL: apple-clang-12.0.0 && !target-arm -// XFAIL: apple-clang-11 && !target-arm -// XFAIL: apple-clang-10 && !target-arm -// XFAIL: apple-clang-9 && !target-arm -// 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 +// XFAIL: apple-clang-12.0.0 && !target={{arm.*}} +// XFAIL: apple-clang-11 && !target={{arm.*}} +// XFAIL: apple-clang-10 && !target={{arm.*}} +// XFAIL: apple-clang-9 && !target={{arm.*}} +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}} // 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,7 @@ // UNSUPPORTED: no-exceptions // __cxa_uncaught_exceptions is not re-exported from libc++ until macOS 10.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 +// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14}} #include #include diff --git a/libunwind/test/remember_state_leak.pass.sh.s b/libunwind/test/remember_state_leak.pass.sh.s --- a/libunwind/test/remember_state_leak.pass.sh.s +++ b/libunwind/test/remember_state_leak.pass.sh.s @@ -1,5 +1,5 @@ -# REQUIRES: x86, linux -# RUN: %{build} -target x86_64-unknown-linux-gnu +# REQUIRES: target={{x86_64-.+-linux-gnu}} +# RUN: %{build} # RUN: %{run} # The following assembly is a translation of this code: diff --git a/libunwind/test/signal_unwind.pass.cpp b/libunwind/test/signal_unwind.pass.cpp --- a/libunwind/test/signal_unwind.pass.cpp +++ b/libunwind/test/signal_unwind.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // Ensure that the unwinder can cope with the signal handler. -// REQUIRES: linux && (target-aarch64 || target-x86_64) +// REQUIRES: linux && (target={{aarch64-.+}} || target={{x86_64-.+}}) #include #include diff --git a/libunwind/test/unwind_leaffunction.pass.cpp b/libunwind/test/unwind_leaffunction.pass.cpp --- a/libunwind/test/unwind_leaffunction.pass.cpp +++ b/libunwind/test/unwind_leaffunction.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // Ensure that leaf function can be unwund. -// REQUIRES: linux && (target-aarch64 || target-x86_64) +// REQUIRES: linux && (target={{aarch64-.+}} || target={{x86_64-.+}}) #include #include