From c360553c15a8e5aa94d2236eb73e7dfeab9543e5 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Fri, 18 Jun 2021 13:33:14 -0400 Subject: [PATCH] [runtimes] Simplify how we specify XFAIL & friends based on the triple Now that Lit supports regular expressions inside XFAIL & friends, it is much easier to write Lit annotations based on the triple. Differential Revision: https://reviews.llvm.org/D104747 --- .../language.support/cxa_deleted_virtual.pass.cpp | 7 +------ .../aligned_alloc_availability.verify.cpp | 6 +----- .../support.dynamic/libcpp_deallocate.sh.cpp | 5 +---- .../new_faligned_allocation.pass.cpp | 5 +---- .../aligned_allocation_macro.compile.pass.cpp | 6 +----- .../libcxx/thread/atomic.availability.verify.cpp | 8 +------- .../libcxx/thread/barrier.availability.verify.cpp | 8 +------- .../libcxx/thread/latch.availability.verify.cpp | 8 +------- .../libcxx/thread/semaphore.availability.verify.cpp | 8 +------- ...0202_notify_from_pthread_created_thread.pass.cpp | 5 +---- .../thread.thread.this/sleep_for.pass.cpp | 4 +--- .../thread.thread.this/sleep_for.signals.pass.cpp | 4 +--- .../charconv.to.chars/availability.fail.cpp | 7 +------ .../atomic_wait.pass.cpp | 8 +------- .../syserr.errcat.objects/generic_category.pass.cpp | 5 +---- .../syserr.errcat.objects/system_category.pass.cpp | 5 +---- .../fstreams/filebuf.members/open_path.pass.cpp | 7 +------ .../fstreams/fstream.cons/path.pass.cpp | 7 +------ .../fstreams/fstream.members/open_path.pass.cpp | 7 +------ .../fstreams/ifstream.cons/path.pass.cpp | 7 +------ .../fstreams/ifstream.members/open_path.pass.cpp | 7 +------ .../fstreams/ofstream.cons/path.pass.cpp | 7 +------ .../fstreams/ofstream.members/open_path.pass.cpp | 7 +------ .../directory_entry.mods/refresh.pass.cpp | 2 +- .../directory_entry.obs/file_size.pass.cpp | 2 +- .../directory_entry.obs/hard_link_count.pass.cpp | 2 +- .../directory_entry.obs/last_write_time.pass.cpp | 2 +- .../fs.op.funcs/fs.op.copy_file/copy_file.pass.cpp | 2 +- .../create_directories.pass.cpp | 2 +- .../create_directory.pass.cpp | 2 +- .../create_directory_with_attributes.pass.cpp | 2 +- .../fs.op.funcs/fs.op.file_size/file_size.pass.cpp | 2 +- .../fs.op.last_write_time/last_write_time.pass.cpp | 2 +- .../test/std/input.output/filesystems/lit.local.cfg | 2 +- .../istream.formatted.arithmetic/bool.pass.cpp | 7 +------ .../istream.formatted.arithmetic/double.pass.cpp | 7 +------ .../istream.formatted.arithmetic/float.pass.cpp | 7 +------ .../istream.formatted.arithmetic/int.pass.cpp | 7 +------ .../istream.formatted.arithmetic/long.pass.cpp | 7 +------ .../long_double.pass.cpp | 7 +------ .../istream.formatted.arithmetic/long_long.pass.cpp | 7 +------ .../istream.formatted.arithmetic/pointer.pass.cpp | 7 +------ .../istream.formatted.arithmetic/short.pass.cpp | 7 +------ .../unsigned_int.pass.cpp | 7 +------ .../unsigned_long.pass.cpp | 7 +------ .../unsigned_long_long.pass.cpp | 7 +------ .../unsigned_short.pass.cpp | 7 +------ .../istream_extractors/streambuf.pass.cpp | 7 +------ .../input.streams/istream.unformatted/get.pass.cpp | 7 +------ .../istream.unformatted/get_chart.pass.cpp | 7 +------ .../istream.unformatted/get_pointer_size.pass.cpp | 7 +------ .../get_pointer_size_chart.pass.cpp | 7 +------ .../istream.unformatted/get_streambuf.pass.cpp | 7 +------ .../get_streambuf_chart.pass.cpp | 7 +------ .../getline_pointer_size.pass.cpp | 7 +------ .../getline_pointer_size_chart.pass.cpp | 7 +------ .../istream.unformatted/ignore.pass.cpp | 7 +------ .../input.streams/istream.unformatted/peek.pass.cpp | 7 +------ .../input.streams/istream.unformatted/read.pass.cpp | 7 +------ .../istream.unformatted/seekg_off.pass.cpp | 4 +--- .../minmax_showbase.pass.cpp | 4 +--- .../ostream.inserters.arithmetic/minus1.pass.cpp | 2 +- .../ios.types/ios_Init/ios_Init.multiple.pass.cpp | 7 +------ .../delete_align_val_t_replace.pass.cpp | 6 +----- .../new.delete.array/new_align_val_t.pass.cpp | 6 +----- .../new_align_val_t_nothrow.pass.cpp | 6 +----- .../new_align_val_t_nothrow_replace.pass.cpp | 6 +----- .../sized_delete_array_fsizeddeallocation.pass.cpp | 4 +--- .../delete_align_val_t_replace.pass.cpp | 6 +----- .../new.delete.single/new_align_val_t.pass.cpp | 6 +----- .../new_align_val_t_nothrow.pass.cpp | 6 +----- .../new_align_val_t_nothrow_replace.pass.cpp | 6 +----- .../sized_delete_fsizeddeallocation.pass.cpp | 4 +--- .../uncaught/uncaught_exceptions.pass.cpp | 7 ++----- .../locale.collate.byname/compare.pass.cpp | 5 ++--- .../ctor_char16_t_char8_t.pass.cpp | 8 +------- .../ctor_char32_t_char8_t.pass.cpp | 8 +------- .../locale.codecvt/ctor_char16_t_char8_t.pass.cpp | 8 +------- .../locale.codecvt/ctor_char32_t_char8_t.pass.cpp | 8 +------- .../char16_t_char8_t_always_noconv.pass.cpp | 8 +------- .../char16_t_char8_t_encoding.pass.cpp | 8 +------- .../char16_t_char8_t_in.pass.cpp | 8 +------- .../char16_t_char8_t_length.pass.cpp | 8 +------- .../char16_t_char8_t_max_length.pass.cpp | 8 +------- .../char16_t_char8_t_out.pass.cpp | 8 +------- .../char16_t_char8_t_unshift.pass.cpp | 8 +------- .../char32_t_char8_t_always_noconv.pass.cpp | 8 +------- .../char32_t_char8_t_encoding.pass.cpp | 8 +------- .../char32_t_char8_t_in.pass.cpp | 8 +------- .../char32_t_char8_t_length.pass.cpp | 8 +------- .../char32_t_char8_t_max_length.pass.cpp | 8 +------- .../char32_t_char8_t_out.pass.cpp | 8 +------- .../char32_t_char8_t_unshift.pass.cpp | 8 +------- .../utf_sanity_check.pass.cpp | 8 +------- .../locale.codecvt/types_char16_t_char8_t.pass.cpp | 8 +------- .../locale.codecvt/types_char32_t_char8_t.pass.cpp | 8 +------- .../get_long_double_zh_CN.pass.cpp | 2 +- .../put_long_double_zh_CN.pass.cpp | 2 +- .../facet.num.put.members/put_long_double.pass.cpp | 2 +- .../facet.num.get.members/get_long.pass.cpp | 7 +------ .../locale.time.get.byname/get_one.pass.cpp | 2 +- .../locale.time.get.byname/get_one_wide.pass.cpp | 2 +- .../locale.time.get.byname/get_weekday.pass.cpp | 2 +- .../get_weekday_wide.pass.cpp | 2 +- .../locale.time.put.byname/put1.pass.cpp | 2 +- .../locales/locale/locale.cons/assign.pass.cpp | 8 +------- .../locale/locale.cons/char_pointer.pass.cpp | 8 +------- .../locales/locale/locale.cons/copy.pass.cpp | 8 +------- .../locales/locale/locale.cons/default.pass.cpp | 8 +------- .../locale.cons/locale_char_pointer_cat.pass.cpp | 8 +------- .../locale/locale.cons/locale_facetptr.pass.cpp | 8 +------- .../locale/locale.cons/locale_locale_cat.pass.cpp | 8 +------- .../locale/locale.cons/locale_string_cat.pass.cpp | 8 +------- .../locales/locale/locale.cons/string.pass.cpp | 8 +------- .../locales/locale/locale.members/combine.pass.cpp | 8 +------- .../locales/locale/locale.statics/classic.pass.cpp | 8 +------- .../locales/locale/locale.statics/global.pass.cpp | 8 +------- .../std/numerics/rand/rand.device/ctor.pass.cpp | 4 +--- .../std/numerics/rand/rand.device/eval.pass.cpp | 4 +--- .../std/re/re.alg/re.alg.match/awk.locale.pass.cpp | 2 +- .../re/re.alg/re.alg.match/basic.locale.pass.cpp | 2 +- .../std/re/re.alg/re.alg.match/ecma.locale.pass.cpp | 2 +- .../re/re.alg/re.alg.match/extended.locale.pass.cpp | 2 +- .../std/re/re.alg/re.alg.search/awk.locale.pass.cpp | 2 +- .../re/re.alg/re.alg.search/basic.locale.pass.cpp | 2 +- .../re/re.alg/re.alg.search/ecma.locale.pass.cpp | 2 +- .../re.alg/re.alg.search/extended.locale.pass.cpp | 2 +- .../std/re/re.traits/lookup_collatename.pass.cpp | 2 +- .../string.capacity/over_max_size.pass.cpp | 4 +--- .../string.capacity/reserve_size.pass.cpp | 8 +------- .../futures/futures.async/async_race.38682.pass.cpp | 7 +------ .../futures/futures.future_error/what.pass.cpp | 4 +--- .../test/std/thread/thread.barrier/arrive.pass.cpp | 8 +------- .../thread/thread.barrier/arrive_and_drop.pass.cpp | 8 +------- .../thread/thread.barrier/arrive_and_wait.pass.cpp | 8 +------- .../std/thread/thread.barrier/completion.pass.cpp | 8 +------- .../thread/thread.latch/arrive_and_wait.pass.cpp | 8 +------- .../std/thread/thread.latch/count_down.pass.cpp | 8 +------- .../test/std/thread/thread.latch/try_wait.pass.cpp | 8 +------- .../thread.lock.shared.cons/default.pass.cpp | 4 +--- .../thread.lock.shared.cons/move_assign.pass.cpp | 4 +--- .../thread.lock.shared.cons/move_ctor.pass.cpp | 4 +--- .../thread.lock.shared.cons/mutex.pass.cpp | 4 +--- .../mutex_adopt_lock.pass.cpp | 4 +--- .../mutex_defer_lock.pass.cpp | 4 +--- .../thread.lock.shared.cons/mutex_duration.pass.cpp | 4 +--- .../mutex_time_point.pass.cpp | 4 +--- .../mutex_try_to_lock.pass.cpp | 4 +--- .../thread.lock.shared.locking/lock.pass.cpp | 4 +--- .../thread.lock.shared.obs/mutex.pass.cpp | 4 +--- .../thread.lock.shared.obs/owns_lock.pass.cpp | 4 +--- .../thread.shared_mutex.class/assign.fail.cpp | 4 +--- .../thread.shared_mutex.class/copy.fail.cpp | 4 +--- .../thread.shared_mutex.class/default.pass.cpp | 4 +--- .../thread.shared_mutex.class/lock.pass.cpp | 4 +--- .../thread.shared_mutex.class/lock_shared.pass.cpp | 4 +--- .../thread.shared_mutex.class/try_lock.pass.cpp | 4 +--- .../try_lock_shared.pass.cpp | 4 +--- .../assign.compile.fail.cpp | 4 +--- .../copy.compile.fail.cpp | 4 +--- .../thread.sharedtimedmutex.class/default.pass.cpp | 4 +--- .../thread.sharedtimedmutex.class/lock.pass.cpp | 4 +--- .../lock_shared.pass.cpp | 4 +--- .../thread.sharedtimedmutex.class/try_lock.pass.cpp | 4 +--- .../try_lock_for.pass.cpp | 4 +--- .../try_lock_shared.pass.cpp | 4 +--- .../try_lock_shared_for.pass.cpp | 4 +--- .../try_lock_shared_until.pass.cpp | 4 +--- .../try_lock_until.pass.cpp | 4 +--- .../try_lock_until_deadlock_bug.pass.cpp | 4 +--- .../std/thread/thread.semaphore/acquire.pass.cpp | 8 +------- .../std/thread/thread.semaphore/binary.pass.cpp | 8 +------- .../std/thread/thread.semaphore/release.pass.cpp | 8 +------- .../test/std/thread/thread.semaphore/timed.pass.cpp | 8 +------- .../thread/thread.semaphore/try_acquire.pass.cpp | 8 +------- .../any/any.class/any.assign/copy.pass.cpp | 5 +---- .../any/any.class/any.assign/move.pass.cpp | 5 +---- .../any/any.class/any.assign/value.pass.cpp | 5 +---- .../utilities/any/any.class/any.cons/copy.pass.cpp | 5 +---- .../any/any.class/any.cons/in_place_type.pass.cpp | 5 +---- .../utilities/any/any.class/any.cons/move.pass.cpp | 5 +---- .../utilities/any/any.class/any.cons/value.pass.cpp | 5 +---- .../any/any.class/any.modifiers/emplace.pass.cpp | 5 +---- .../any/any.class/any.modifiers/reset.pass.cpp | 5 +---- .../any/any.class/any.modifiers/swap.pass.cpp | 5 +---- .../any.cast/any_cast_pointer.pass.cpp | 5 +---- .../any.cast/any_cast_reference.pass.cpp | 5 +---- ...any_cast_request_invalid_value_category.fail.cpp | 5 +---- .../any.cast/const_correctness.fail.cpp | 5 +---- .../any.cast/not_copy_constructible.fail.cpp | 5 +---- .../utilities/any/any.nonmembers/make_any.pass.cpp | 5 +---- .../std/utilities/any/any.nonmembers/swap.pass.cpp | 5 +---- .../charconv.from.chars/integral.roundtrip.pass.cpp | 7 +------ .../charconv/charconv.to.chars/integral.pass.cpp | 7 +------ .../format/format.error/format.error.pass.cpp | 8 +------- .../format.parse.ctx/check_arg_id.pass.cpp | 8 +------- .../format.parse.ctx/next_arg_id.pass.cpp | 8 +------- .../memory/temporary.buffer/overaligned.pass.cpp | 5 +---- .../optional.bad_optional_access/default.pass.cpp | 5 +---- .../optional.bad_optional_access/derive.pass.cpp | 5 +---- .../optional.object/optional.object.ctor/U.pass.cpp | 5 +---- .../optional.object.ctor/const_T.pass.cpp | 5 +---- .../optional.object.ctor/move.pass.cpp | 5 +---- .../optional.object.ctor/rvalue_T.pass.cpp | 5 +---- .../optional.object.observe/value.pass.cpp | 5 +---- .../optional.object.observe/value_const.pass.cpp | 5 +---- .../value_const_rvalue.pass.cpp | 5 +---- .../optional.object.observe/value_rvalue.pass.cpp | 5 +---- .../optional.specalg/make_optional.pass.cpp | 5 +---- .../time/time.clock/time.clock.file/now.pass.cpp | 7 +------ .../bad_variant_access.pass.cpp | 5 +---- .../variant/variant.get/get_index.pass.cpp | 5 +---- .../utilities/variant/variant.get/get_type.pass.cpp | 5 +---- .../variant.variant/variant.assign/T.pass.cpp | 5 +---- .../variant.variant/variant.assign/copy.pass.cpp | 5 +---- .../variant.variant/variant.assign/move.pass.cpp | 5 +---- .../variant/variant.variant/variant.ctor/T.pass.cpp | 5 +---- .../variant.variant/variant.ctor/copy.pass.cpp | 5 +---- .../variant.variant/variant.ctor/default.pass.cpp | 5 +---- .../variant.ctor/in_place_index_args.pass.cpp | 5 +---- .../in_place_index_init_list_args.pass.cpp | 5 +---- .../variant.ctor/in_place_type_args.pass.cpp | 5 +---- .../in_place_type_init_list_args.pass.cpp | 5 +---- .../variant.variant/variant.ctor/move.pass.cpp | 5 +---- .../variant.mod/emplace_index_args.pass.cpp | 5 +---- .../emplace_index_init_list_args.pass.cpp | 5 +---- .../variant.mod/emplace_type_args.pass.cpp | 5 +---- .../emplace_type_init_list_args.pass.cpp | 5 +---- .../variant.variant/variant.swap/swap.pass.cpp | 5 +---- .../variant.visit/robust_against_adl.pass.cpp | 5 +---- .../utilities/variant/variant.visit/visit.pass.cpp | 5 +---- .../variant.visit/visit_return_type.pass.cpp | 5 +---- libcxx/utils/libcxx/test/params.py | 9 +-------- libcxxabi/test/catch_function_01.pass.cpp | 3 +-- .../test/catch_member_data_pointer_01.pass.cpp | 3 +-- .../test/catch_member_pointer_nullptr.pass.cpp | 5 +---- libcxxabi/test/catch_multi_level_pointer.pass.cpp | 3 +-- libcxxabi/test/catch_pointer_nullptr.pass.cpp | 5 +---- libcxxabi/test/catch_ptr_02.pass.cpp | 2 +- .../test/cxa_vec_new_overflow_PR41395.pass.cpp | 7 +------ libcxxabi/test/dynamic_cast.pass.cpp | 8 ++------ libcxxabi/test/exception_object_alignment.pass.cpp | 6 +----- libcxxabi/test/forced_unwind1.pass.cpp | 8 +------- libcxxabi/test/forced_unwind2.pass.cpp | 8 +------- libcxxabi/test/incomplete_type.sh.cpp | 5 +---- .../test/test_aux_runtime_op_array_new.pass.cpp | 7 +------ libcxxabi/test/test_demangle.pass.cpp | 8 +------- .../test/test_exception_address_alignment.pass.cpp | 13 +++++-------- libcxxabi/test/uncaught_exceptions.pass.cpp | 7 +------ libunwind/test/remember_state_leak.pass.sh.s | 4 ++-- libunwind/test/signal_unwind.pass.cpp | 2 +- libunwind/test/unwind_leaffunction.pass.cpp | 2 +- 252 files changed, 260 insertions(+), 1141 deletions(-) diff --git a/libcxx/test/libcxx/language.support/cxa_deleted_virtual.pass.cpp b/libcxx/test/libcxx/language.support/cxa_deleted_virtual.pass.cpp index 68c610af526d..2f63ee3ceb7c 100644 --- 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 index 3f4f3a1ce14c..8d5a73060e67 100644 --- 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 index 34905bb2e288..66627d9fa676 100644 --- 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 index d423fc4d86c7..5060f062c34c 100644 --- 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 index fbf8f41314c8..2704c9584d43 100644 --- 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 index 8321193da883..e96d461a4572 100644 --- 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 index eda89bb05864..8da39fe3c2df 100644 --- 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 index 402c73181ce3..8555e0e70267 100644 --- 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 index 7b7688bd6a06..a6d5c3667828 100644 --- 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 index 6c084e0c5cb5..30c039136881 100644 --- 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 index dafa16667871..474520c33929 100644 --- 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 index 59e3b28fcfdc..3cdb6735218b 100644 --- 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 index 8c4b1e9b5ac2..e1ca28a20b67 100644 --- 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 index a54988dd7331..d2779aaa19f5 100644 --- 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 index cd8d10b40b91..d90834681bb8 100644 --- 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 index 1e25e90547ac..0e82934e870b 100644 --- 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 index da5e01e6bab8..cf852964b911 100644 --- 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 index 9bb5665aef48..364fe72817ae 100644 --- 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 index 0ca2f06d553b..824201a7cf07 100644 --- 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 index 2309caf9e8c4..aef3014f670a 100644 --- 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 index 24922d6fe3e6..2bb46b876b14 100644 --- 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 index 8e3261450bde..5dc1f74bdaf9 100644 --- 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 index 495f8134b5df..2c8fa8ad846c 100644 --- 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 index f32608687d11..da436fc6b959 100644 --- 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 index 0dba01fe1a9c..271a6e826f2b 100644 --- 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 index 8875c39ceef3..44eac78fe8f4 100644 --- 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 index cb8fb3f6a768..928248b3c2b8 100644 --- 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 index 4e40906a8d84..88e272433fb2 100644 --- 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 index 5174b7d454e0..d6b18e2e043b 100644 --- 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 index cad76aa75199..51c9180f8160 100644 --- 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 index e5f610c80a28..4d5cdf31e5b5 100644 --- 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 index 51f2fa841e53..413ba881b59f 100644 --- 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 index 930dae563b1f..f3a4bb5013f4 100644 --- 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 index fbd625d21ff5..95e9ec4ccd97 100644 --- 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 index e152f4ab4d8c..ea354a487e7b 100644 --- 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 index eaad095cae56..a3f977bcd1e8 100644 --- 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 index 2a303c691a34..2d68dfddd076 100644 --- 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 index 5250b30c103e..563b8d2dff7e 100644 --- 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 index 8cb545cb3874..5d00260a6470 100644 --- 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 index dfb4afc966db..ed198d54a546 100644 --- 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 index 06130c1d9a1b..d6ccc11ee992 100644 --- 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 index db7fe577a233..9b9fab8b9e79 100644 --- 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 index 8a6d94417a98..dbecc33c5308 100644 --- 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 index a5d179d936c9..d0ad52174524 100644 --- 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 index bad99e42059f..984c18890e9c 100644 --- 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 index d87088bc546b..a67ae60a8322 100644 --- 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 index 00dc9d0e3baa..7157c885cc36 100644 --- 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 index 580f9f7bf0d4..d71f29595e25 100644 --- 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 index 9d5710bbbef9..91ae1045b3b7 100644 --- 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 index 6a561c1c03ec..fb3c2d07d36e 100644 --- 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 index 1d3957a6d93a..b3af36e32b39 100644 --- 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 index cb822177bc3b..11b820ef4d61 100644 --- 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 index e932ca407149..8067792e09de 100644 --- 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 index e30ea1225eed..dceb06ada794 100644 --- 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 index 50a1184f7491..44fa59501a51 100644 --- 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 index edebd020a278..72bc2a4c00cc 100644 --- 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 index 4555c6c1ea91..0d0b4a8f40c4 100644 --- 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 index acde79b71f50..be9600cf1561 100644 --- 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 index 3ef761c00980..2e6c2a208216 100644 --- 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 index ebd3a25486b1..d9412bf920ba 100644 --- 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 index 36ca0155c5a7..126151221aa4 100644 --- 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 index 4b9cbd479c6c..8e3b77c420be 100644 --- 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 index 22f2c74898dd..1a9aaa96162a 100644 --- 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 index 968fe205b396..b6c6d4034271 100644 --- 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 index ec53942de44a..08350e59cda6 100644 --- 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 index c085ceed5c35..159d39af12b3 100644 --- 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 index b631f8a8ce20..b407207cc326 100644 --- 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 index b40e5ff1408b..2a5bb21fcdd1 100644 --- 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 index 4189ad9658b4..336a163784bd 100644 --- 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 index 7030e08a404d..d2fc41751ae7 100644 --- 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 index c3d1d6b19944..e65280bb25a1 100644 --- 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 index 843a3f83f3c3..657f8e0fd38a 100644 --- 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 index 25af691897a6..da296f1a3f93 100644 --- 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 index 4f6c1ba15c37..658c0a822ed9 100644 --- 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 index 792292dc927a..8d759ac7eac8 100644 --- 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 index 67a9bfed9abf..d1da936d8faa 100644 --- 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 index e077c870501b..9bd7a2e8489c 100644 --- 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 index eb3e2c969d02..5621f3b35b74 100644 --- 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 index faf29fd2e1b0..4499d8a1a076 100644 --- 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 index c6a7a46ef81f..56a56ac15999 100644 --- 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 index 5167bcc34543..570d017a1df1 100644 --- 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 index d40d4e5b817d..81dcb922f623 100644 --- 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 index 3f1afb280bee..752eea4c8024 100644 --- 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 index 0c359d0b6850..eb77c8237f6f 100644 --- 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 index c4844e5558fd..4a8093228359 100644 --- 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 index 32da259d50ae..790fd1d3ddd1 100644 --- 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 index 0cf2c2ecd350..e3f9384f3b4a 100644 --- 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 index 1976234e1bb3..f193b8568efc 100644 --- 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 index baaadb2bca23..c7d50f29dbcf 100644 --- 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 index d95ba2a84e4a..75cce8154c24 100644 --- 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 index 31aad35c9ae5..436535bb82fa 100644 --- 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 index 3649597fec2d..30743d5946e9 100644 --- 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 index be865e15ed07..7b6124457a17 100644 --- 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 index 8bbe9e0e0dde..31fd07fd1dc5 100644 --- 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 index 82fd14c4e452..95ee89a73cb0 100644 --- 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 index 2beb60c80be5..c009b1f20d29 100644 --- 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 index 69331bba6ff5..8cf77b47a0bd 100644 --- 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 index b8cc831f15a5..0e5254cb9bd6 100644 --- 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 index a7bcacb7408f..ae0837b9e5df 100644 --- 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 index f81bff008697..47e4ab502b87 100644 --- 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 index 8c2712dc1838..791a71c17bc3 100644 --- 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 index 3246b4dee159..d3315d6faee6 100644 --- 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 index c2c2a98442a4..0ddef0321550 100644 --- 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 index 856cf3f60b6c..9ff73e9c2ad0 100644 --- 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 index 8daf3405d86b..0a4d5df78019 100644 --- 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 index b078cbcdb4ab..94e2d26f2c63 100644 --- 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 index af9299af22f3..42b99d3347e0 100644 --- 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 index 0660b331eb8d..012086a626d7 100644 --- 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 index a9a1656de158..c7a67595d175 100644 --- 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 index 23bbc13540b5..694af889dc0e 100644 --- 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 index dba31ef8759c..1ae3f59a8bd8 100644 --- 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 index fb926768e8d3..09889087890c 100644 --- 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 index 3d97944444c5..5745f8a8448c 100644 --- 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 index 1e2fde612b1f..733c7e93275b 100644 --- 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 index 10fca15564a8..5914bb777443 100644 --- 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 index f873b911aee6..f32c2432123a 100644 --- 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 index 38ec71ea0a20..458fe0866a1b 100644 --- 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 index bcbb9ec8569e..4cef9bd160af 100644 --- 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 index a55915d121b3..f91850f0cd5d 100644 --- 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 index a93a2694464b..7588f2d36544 100644 --- 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 index 1cec60209648..3b9b8e2a8301 100644 --- 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 index 8e651f6d0301..26be2069fab5 100644 --- 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 index ea77dd83fc97..5a0dd18c821e 100644 --- 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 index 4ba87bb45232..275927841c24 100644 --- 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 index fe3435eae929..130ef49e81e4 100644 --- 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 index 840cc634a3da..e97c4df3473f 100644 --- 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 index 3a171f81e696..8902d06183b1 100644 --- 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 index aeb7c50bb817..27ff6eef38dc 100644 --- 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 index d7d2efca9042..54d9c4ee69cb 100644 --- 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 index a14ec20c651a..c6e2cd14dcee 100644 --- 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 index c8686a3dc2e5..4fe7cd054339 100644 --- 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 index 4b256111a442..0b093fc235bc 100644 --- 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 index e19695e760c5..31df3714315d 100644 --- 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 index 7f6ce3539604..038c5ac169e2 100644 --- 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 index 920281981e46..de3f9f785af0 100644 --- 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 index abbfb869895c..baa73fb3ae77 100644 --- 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 index 69160fe89a8e..5d0a01206492 100644 --- 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 index e33590f1c78a..0038bf1ca86d 100644 --- 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 index 8283aa3546a1..b627bbb26439 100644 --- 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 index d6081a63c3c1..3f3868e1289f 100644 --- 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 index d251b0d14777..07b1b3210891 100644 --- 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 index d16bf5441eed..612fc34e8acd 100644 --- 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 index 250ba77025bd..d09cde085db3 100644 --- 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 index 0147a32e46d7..4e1ffd5d3e55 100644 --- 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 index 16719e0f92a1..fac91220eafc 100644 --- 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 index 29160d5e76a8..66e810b02cc5 100644 --- 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 index 9f242f484a48..074c906b2d0f 100644 --- 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 index 60c85945b904..0e3721bb0de7 100644 --- 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 index fb0650ba79b7..dc980ae46341 100644 --- 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 index d3ae30e578c2..7c2fdcddf082 100644 --- 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 index a8c6bcb6d7d6..23eae754bcfe 100644 --- 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 index 2b71e9cadab6..7fc5442c64fb 100644 --- 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 index 402735ac3947..27086a84919c 100644 --- 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 index ce659e846397..76c6cebbee49 100644 --- 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 index c442c4ce747b..4d97129cd38d 100644 --- 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 index b6c42085d6ba..fec48900fab4 100644 --- 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 index 075074419ced..f1d18c80d6a8 100644 --- 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 index 7c8dcc2a62c1..fc9eb36937ff 100644 --- 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 index 6474fd9e7cc0..9af5a4fc0a06 100644 --- 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 index a9f9b7e6c7d2..c9ec2483a664 100644 --- 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 index e966622dae85..cd27c79cc942 100644 --- 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 index ef0c39729df7..f0bdf0dfa75e 100644 --- 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 index ac2f702db4b1..d8a02a6bc4c0 100644 --- 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 index ffc9eeabc638..172742161d81 100644 --- 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 index 481741fbcda0..20bf000d3fe0 100644 --- 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 index a42fdc1b73cc..16e929187633 100644 --- 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 index 61c569cf6e69..eda6453d58ee 100644 --- 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 index 324870a50e3b..02ee39876a7a 100644 --- 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 index 5ea731afbe08..3118893efd21 100644 --- 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 index c817c5ff1ac2..5dd2b7cf2fa4 100644 --- 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 index 547594b71e59..cd08e2ba8101 100644 --- 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 index 2ebee35e3608..b80c9fea0295 100644 --- 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 index 76dac0cc403e..e491e13e50f9 100644 --- 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 index 34520ecfae05..0954341adfae 100644 --- 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 index f71d12f8740e..35cb6ce7dc82 100644 --- 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 index 0e41114af3bb..b59bb76e5b76 100644 --- 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 index fff04834fadd..4a1b0fc8eed1 100644 --- 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 index 5065ed607624..f054cd8a719a 100644 --- 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 index 06d1825afa0b..579ea24cc18e 100644 --- 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 index 1a7baa4baf1c..0c8b668ddaa4 100644 --- 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 index fe908bf07cd0..d8710213f171 100644 --- 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 index 75e8ad9ee9f7..d55bbda74143 100644 --- 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 index feec4c00ddc4..5168d69ddea4 100644 --- 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 index 5f1ba18b2c83..4b4aa2923662 100644 --- 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 index 7839d4b4fcf1..ee5684ee2ea8 100644 --- 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 index e62b74f08337..1a50a694ef8d 100644 --- 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 index 2d6562a3b55c..79d9a440dba1 100644 --- 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 index ac793b2bc7a6..73cdad798cfb 100644 --- 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 index 6b9a5e9e4034..234efc83423b 100644 --- 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 index 9c3238879469..44a67f7aa03d 100644 --- 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 index 6b2883ed3ce2..6b8f93073b03 100644 --- 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 index 05027bacf8a8..440159f12d72 100644 --- 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 index 5329bd3a0a40..88450a33afdc 100644 --- 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 index 3548b65724a1..4afe49190603 100644 --- 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 index 88958e460ff6..979a3fed463b 100644 --- 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 index 68e99578b0c9..5b18834e5146 100644 --- 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 index 3b2304f61f5e..6d53995a627a 100644 --- 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 index b5286fb52994..a4911a5a445e 100644 --- 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 index 517e0d64d401..7f0439be216d 100644 --- 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 index 34b770e36858..ad1112f2583d 100644 --- 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 index c9058a305880..e99c872d64f3 100644 --- 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 index 45c3c66a5cb5..ddfc491c1696 100644 --- 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 index 4e86bcd49bb1..e4918f7cac11 100644 --- 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 index e10346e14eb1..dddd8facff05 100644 --- 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 index eba21bb9db0d..8cd9bcb2fa69 100644 --- 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 index 03aa47454808..103a6317b24e 100644 --- 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 index dff3dca9a62c..7402e98b663f 100644 --- 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 index d677b9a8a050..28856997c562 100644 --- 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 index c1ad1f09c5cc..681fe28a2a9b 100644 --- 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 index dc050818da11..6011424f6e7e 100644 --- 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 index 751c6551e115..cb020b04a421 100644 --- 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 index 830d4a4465a8..bed0026ccc50 100644 --- 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 index 9f0889c089b1..e96269b4fadf 100644 --- 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 index 546273187c66..816578c0af67 100644 --- 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 index 6c85377bb9b9..2e6f51ee2faf 100644 --- 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 index db8db2e8059b..bdda20d7f4b4 100644 --- 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 index 340c270ad84e..78ac9e14407e 100644 --- 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 index 127059802032..810d12139063 100644 --- 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 index ca391666835c..a61e0377bce3 100644 --- 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 index 77a85ccee226..f39e21ceb133 100644 --- 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 index eb25721fb626..248730f56806 100644 --- 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 index 075f9687d6c8..05a0121fd498 100644 --- 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 index 8e26c86f4e10..a77aa40fb3b9 100644 --- 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 index aabfbf1e93ba..cb6a44b14359 100644 --- 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 index 691cb35382c9..cbe3e53f4636 100644 --- 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 index 67587d418ddf..e838c1359bb1 100644 --- 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 index a2b77c28cc76..9dbf41f986e2 100644 --- 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 index 03fad25caa06..721ebfe8e488 100644 --- 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 index aa699860a31d..9fff8fee64b0 100644 --- 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 index 3b81a66508aa..5886162dbab8 100644 --- 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 index d720fa968fff..9bb4311c6629 100644 --- 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 index 60fd7b3f9199..5b9d59567eaa 100644 --- 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 index bdaa573205e8..991f51ef902c 100644 --- a/libcxx/utils/libcxx/test/params.py +++ b/libcxx/utils/libcxx/test/params.py @@ -57,15 +57,8 @@ DEFAULT_PARAMETERS = [ 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 index 02ecec22e928..b7a6a007c84d 100644 --- 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 index 2ee68ba4770b..7279eee2a07f 100644 --- 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 index 321aa8272747..b2af9190ece4 100644 --- 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 index 26b025e2cf1d..38374e8abd68 100644 --- 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 index 3320d2885104..9abcf7444e15 100644 --- 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 index 444aac899d5e..b849559ea42f 100644 --- 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 index b821ae86b98a..9d75fc1060da 100644 --- 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 index 87ca6a6dd70e..51e294f74c05 100644 --- 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 index 2d39800e9d71..c6228ba87899 100644 --- 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 index 2bd39f310cbd..69f93ffaacc0 100644 --- 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 index 9f73a673b420..cb527581687a 100644 --- 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 index 6995226fe808..aae1a3c4360f 100644 --- 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 index ddf802dc6c57..c70c781044d2 100644 --- 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 index 009bf4502878..1780e684cbb5 100644 --- 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 index 5d59709d599c..117251cbe34c 100644 --- 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 index 44186d59e3ba..82041ad203cc 100644 --- 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 index eb363d0102a8..f18d1768e7c4 100644 --- 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 index 3acd77209a1c..c16adeb4d18c 100644 --- 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 index 725a29163e50..a05e315d9baf 100644 --- 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