[libcxx] Add XFAILs for aligned allocation tests on AppleClang 9

Some people are still running the test suite using AppleClang 9.

llvm-svn: 348507

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 87c0cf3..4dd9390 100644 (file)
--- 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
@@ -20,22 +20,22 @@
 // Aligned allocation was not provided before macosx10.12 and as a result we
 // get availability errors when the deployment target is older than macosx10.13.
 // However, AppleClang 10 (and older) don't trigger availability errors.
-// XFAIL: !apple-clang-10 && availability=macosx10.12
-// XFAIL: !apple-clang-10 && availability=macosx10.11
-// XFAIL: !apple-clang-10 && availability=macosx10.10
-// XFAIL: !apple-clang-10 && availability=macosx10.9
-// XFAIL: !apple-clang-10 && availability=macosx10.8
-// XFAIL: !apple-clang-10 && availability=macosx10.7
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.9
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.8
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.7
 
 // On AppleClang 10 (and older), instead of getting an availability failure
 // like above, we get a link error when we link against a dylib that does
 // not export the aligned allocation functions.
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.12
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.11
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.10
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.9
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.8
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.7
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.12
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.11
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.10
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.9
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.8
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.7
 
 // 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 df2db2a..d6194b0 100644 (file)
--- 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
@@ -18,22 +18,22 @@
 // Aligned allocation was not provided before macosx10.12 and as a result we
 // get availability errors when the deployment target is older than macosx10.13.
 // However, AppleClang 10 (and older) don't trigger availability errors.
-// XFAIL: !apple-clang-10 && availability=macosx10.12
-// XFAIL: !apple-clang-10 && availability=macosx10.11
-// XFAIL: !apple-clang-10 && availability=macosx10.10
-// XFAIL: !apple-clang-10 && availability=macosx10.9
-// XFAIL: !apple-clang-10 && availability=macosx10.8
-// XFAIL: !apple-clang-10 && availability=macosx10.7
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.9
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.8
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.7
 
 // On AppleClang 10 (and older), instead of getting an availability failure
 // like above, we get a link error when we link against a dylib that does
 // not export the aligned allocation functions.
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.12
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.11
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.10
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.9
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.8
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.7
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.12
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.11
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.10
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.9
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.8
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.7
 
 // 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_nothrow.pass.cpp b/libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow.pass.cpp
index cf51b97..59878ae 100644 (file)
--- 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
@@ -18,22 +18,22 @@
 // Aligned allocation was not provided before macosx10.12 and as a result we
 // get availability errors when the deployment target is older than macosx10.13.
 // However, AppleClang 10 (and older) don't trigger availability errors.
-// XFAIL: !apple-clang-10 && availability=macosx10.12
-// XFAIL: !apple-clang-10 && availability=macosx10.11
-// XFAIL: !apple-clang-10 && availability=macosx10.10
-// XFAIL: !apple-clang-10 && availability=macosx10.9
-// XFAIL: !apple-clang-10 && availability=macosx10.8
-// XFAIL: !apple-clang-10 && availability=macosx10.7
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.9
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.8
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.7
 
 // On AppleClang 10 (and older), instead of getting an availability failure
 // like above, we get a link error when we link against a dylib that does
 // not export the aligned allocation functions.
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.12
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.11
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.10
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.9
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.8
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.7
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.12
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.11
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.10
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.9
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.8
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.7
 
 // 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_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 f463bc7..fc713db 100644 (file)
--- 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
@@ -13,22 +13,22 @@
 // Aligned allocation was not provided before macosx10.12 and as a result we
 // get availability errors when the deployment target is older than macosx10.13.
 // However, AppleClang 10 (and older) don't trigger availability errors.
-// XFAIL: !apple-clang-10 && availability=macosx10.12
-// XFAIL: !apple-clang-10 && availability=macosx10.11
-// XFAIL: !apple-clang-10 && availability=macosx10.10
-// XFAIL: !apple-clang-10 && availability=macosx10.9
-// XFAIL: !apple-clang-10 && availability=macosx10.8
-// XFAIL: !apple-clang-10 && availability=macosx10.7
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.9
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.8
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.7
 
 // On AppleClang 10 (and older), instead of getting an availability failure
 // like above, we get a link error when we link against a dylib that does
 // not export the aligned allocation functions.
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.12
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.11
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.10
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.9
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.8
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.7
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.12
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.11
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.10
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.9
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.8
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.7
 
 // XFAIL: no-aligned-allocation && !gcc
 

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 36349a4..19cabcc 100644 (file)
--- 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
@@ -19,22 +19,22 @@
 // Aligned allocation was not provided before macosx10.12 and as a result we
 // get availability errors when the deployment target is older than macosx10.13.
 // However, AppleClang 10 (and older) don't trigger availability errors.
-// XFAIL: !apple-clang-10 && availability=macosx10.12
-// XFAIL: !apple-clang-10 && availability=macosx10.11
-// XFAIL: !apple-clang-10 && availability=macosx10.10
-// XFAIL: !apple-clang-10 && availability=macosx10.9
-// XFAIL: !apple-clang-10 && availability=macosx10.8
-// XFAIL: !apple-clang-10 && availability=macosx10.7
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.9
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.8
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.7
 
 // On AppleClang 10 (and older), instead of getting an availability failure
 // like above, we get a link error when we link against a dylib that does
 // not export the aligned allocation functions.
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.12
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.11
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.10
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.9
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.8
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.7
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.12
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.11
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.10
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.9
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.8
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.7
 
 // 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 7541327..7cf1aca 100644 (file)
--- 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
@@ -12,22 +12,22 @@
 // Aligned allocation was not provided before macosx10.12 and as a result we
 // get availability errors when the deployment target is older than macosx10.13.
 // However, AppleClang 10 (and older) don't trigger availability errors.
-// XFAIL: !apple-clang-10 && availability=macosx10.12
-// XFAIL: !apple-clang-10 && availability=macosx10.11
-// XFAIL: !apple-clang-10 && availability=macosx10.10
-// XFAIL: !apple-clang-10 && availability=macosx10.9
-// XFAIL: !apple-clang-10 && availability=macosx10.8
-// XFAIL: !apple-clang-10 && availability=macosx10.7
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.9
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.8
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.7
 
 // On AppleClang 10 (and older), instead of getting an availability failure
 // like above, we get a link error when we link against a dylib that does
 // not export the aligned allocation functions.
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.12
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.11
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.10
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.9
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.8
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.7
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.12
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.11
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.10
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.9
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.8
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.7
 
 // 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 cfd225d..dd2666e 100644 (file)
--- 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
@@ -12,22 +12,22 @@
 // Aligned allocation was not provided before macosx10.12 and as a result we
 // get availability errors when the deployment target is older than macosx10.13.
 // However, AppleClang 10 (and older) don't trigger availability errors.
-// XFAIL: !apple-clang-10 && availability=macosx10.12
-// XFAIL: !apple-clang-10 && availability=macosx10.11
-// XFAIL: !apple-clang-10 && availability=macosx10.10
-// XFAIL: !apple-clang-10 && availability=macosx10.9
-// XFAIL: !apple-clang-10 && availability=macosx10.8
-// XFAIL: !apple-clang-10 && availability=macosx10.7
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.9
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.8
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.7
 
 // On AppleClang 10 (and older), instead of getting an availability failure
 // like above, we get a link error when we link against a dylib that does
 // not export the aligned allocation functions.
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.12
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.11
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.10
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.9
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.8
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.7
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.12
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.11
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.10
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.9
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.8
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.7
 
 // 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 c47ec4f..514a2b8 100644 (file)
--- 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
@@ -13,22 +13,22 @@
 // Aligned allocation was not provided before macosx10.12 and as a result we
 // get availability errors when the deployment target is older than macosx10.13.
 // However, AppleClang 10 (and older) don't trigger availability errors.
-// XFAIL: !apple-clang-10 && availability=macosx10.12
-// XFAIL: !apple-clang-10 && availability=macosx10.11
-// XFAIL: !apple-clang-10 && availability=macosx10.10
-// XFAIL: !apple-clang-10 && availability=macosx10.9
-// XFAIL: !apple-clang-10 && availability=macosx10.8
-// XFAIL: !apple-clang-10 && availability=macosx10.7
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.9
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.8
+// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.7
 
 // On AppleClang 10 (and older), instead of getting an availability failure
 // like above, we get a link error when we link against a dylib that does
 // not export the aligned allocation functions.
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.12
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.11
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.10
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.9
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.8
-// XFAIL: apple-clang-10 && with_system_cxx_lib=macosx10.7
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.12
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.11
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.10
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.9
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.8
+// XFAIL: (apple-clang-9 || apple-clang-10) && with_system_cxx_lib=macosx10.7
 
 // NOTE: gcc doesn't provide -faligned-allocation flag to test for
 // XFAIL: no-aligned-allocation && !gcc