XFAIL test on OS X availability

llvm-svn: 345529

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 (file)
--- 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 (file)
--- 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