Commit 17c9824f authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r351670: 

------------------------------------------------------------------------
r351670 | ericwf | 2019-01-20 02:21:35 +0100 (Sun, 20 Jan 2019) | 7 lines

Fix aligned allocation availability XFAILs after D56445.

D56445 bumped the minimum Mac OS X version required for aligned
allocation from 10.13 to 10.14. This caused libc++ tests depending
on the old value to break.

This patch updates the XFAILs for those tests to include 10.13.
------------------------------------------------------------------------

llvm-svn: 351980
parent b00b2b84

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/delete_align_val_t_replace.pass.cpp

+5 −3
Original line number Diff line number Diff line
@@ -17,9 +17,11 @@ 
// None of the current GCC compilers support this.

// UNSUPPORTED: gcc-5, gcc-6



// 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.

// Aligned allocation was not provided before macosx10.14 and as a result we

// get availability errors when the deployment target is older than macosx10.14.

// However, AppleClang 10 (and older) don't trigger availability errors, and

// Clang < 8.0 doesn't warn for 10.13.

// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13

// 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

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t.pass.cpp

+5 −3
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
// FIXME change this to XFAIL.

// UNSUPPORTED: no-aligned-allocation && !gcc



// 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.

// Aligned allocation was not provided before macosx10.14 and as a result we

// get availability errors when the deployment target is older than macosx10.14.

// However, AppleClang 10 (and older) don't trigger availability errors, and

// Clang < 8.0 doesn't warn for 10.13.

// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13

// 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

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow.pass.cpp

+5 −3
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ 
// FIXME turn this into an XFAIL

// UNSUPPORTED: no-aligned-allocation && !gcc



// 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.

// Aligned allocation was not provided before macosx10.14 and as a result we

// get availability errors when the deployment target is older than macosx10.14.

// However, AppleClang 10 (and older) don't trigger availability errors, and

// Clang < 8.0 doesn't warn for 10.13.

// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13

// 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

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.array/new_align_val_t_nothrow_replace.pass.cpp

+5 −3
Original line number Diff line number Diff line
@@ -10,9 +10,11 @@ 
// UNSUPPORTED: c++98, c++03, c++11, c++14

// UNSUPPORTED: sanitizer-new-delete



// 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.

// Aligned allocation was not provided before macosx10.14 and as a result we

// get availability errors when the deployment target is older than macosx10.14.

// However, AppleClang 10 (and older) don't trigger availability errors, and

// Clang < 8.0 doesn't warn for 10.13.

// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13

// 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

libcxx/test/std/language.support/support.dynamic/new.delete/new.delete.single/delete_align_val_t_replace.pass.cpp

+5 −3
Original line number Diff line number Diff line
@@ -16,9 +16,11 @@ 
// None of the current GCC compilers support this.

// UNSUPPORTED: gcc-5, gcc-6



// 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.

// Aligned allocation was not provided before macosx10.14 and as a result we

// get availability errors when the deployment target is older than macosx10.14.

// However, AppleClang 10 (and older) don't trigger availability errors, and

// Clang < 8.0 doesn't warn for 10.13

// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13

// 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