From 5d3c5ba7d5825c5482d149c95382bf89fdad1245 Mon Sep 17 00:00:00 2001 From: Eric Fiselier Date: Mon, 29 Oct 2018 19:52:22 +0000 Subject: [PATCH] XFAIL test on OS X availability llvm-svn: 345529 --- .../support.dynamic/libcpp_deallocate.sh.cpp | 12 ++++++------ libcxx/utils/libcxx/test/config.py | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) 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 c280d86..0f6b243 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 @@ -14,12 +14,12 @@ // definitions, which does not yet provide aligned allocation // XFAIL: LIBCXX-WINDOWS-FIXME -// XFAIL: with_system_cxx_lib=macosx10.12 -// XFAIL: with_system_cxx_lib=macosx10.11 -// XFAIL: with_system_cxx_lib=macosx10.10 -// XFAIL: with_system_cxx_lib=macosx10.9 -// XFAIL: with_system_cxx_lib=macosx10.7 -// XFAIL: with_system_cxx_lib=macosx10.8 +// XFAIL: with_system_cxx_lib=macosx10.12 || availability=macosx10.12 +// XFAIL: with_system_cxx_lib=macosx10.11 || availability=macosx10.11 +// XFAIL: with_system_cxx_lib=macosx10.10 || availability=macosx10.10 +// XFAIL: with_system_cxx_lib=macosx10.9 || availability=macosx10.9 +// XFAIL: with_system_cxx_lib=macosx10.8 || availability=macosx10.8 +// XFAIL: with_system_cxx_lib=macosx10.7 || availability=macosx10.7 // XFAIL: sanitizer-new-delete, ubsan diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 4ed88cd..f63c41d 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -585,7 +585,7 @@ class Configuration(object): self.cxx.flags += ['-arch', arch] self.cxx.flags += ['-m' + name + '-version-min=' + version] - # Disable availability unless explicitely requested + # Disable availability unless explicitly requested if not self.with_availability: self.cxx.flags += ['-D_LIBCPP_DISABLE_AVAILABILITY'] # FIXME(EricWF): variant_size.pass.cpp requires a slightly larger -- 2.7.4