Skip to content

Commit 17c9824

Browse files
zmodemzmodem
committed
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
1 parent b00b2b8 commit 17c9824

8 files changed

+40
-24
lines changed

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,11 @@
1717
// None of the current GCC compilers support this.
1818
// UNSUPPORTED: gcc-5, gcc-6
1919

20-
// Aligned allocation was not provided before macosx10.12 and as a result we
21-
// get availability errors when the deployment target is older than macosx10.13.
22-
// However, AppleClang 10 (and older) don't trigger availability errors.
20+
// Aligned allocation was not provided before macosx10.14 and as a result we
21+
// get availability errors when the deployment target is older than macosx10.14.
22+
// However, AppleClang 10 (and older) don't trigger availability errors, and
23+
// Clang < 8.0 doesn't warn for 10.13.
24+
// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13
2325
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
2426
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
2527
// 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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
// FIXME change this to XFAIL.
1616
// UNSUPPORTED: no-aligned-allocation && !gcc
1717

18-
// Aligned allocation was not provided before macosx10.12 and as a result we
19-
// get availability errors when the deployment target is older than macosx10.13.
20-
// However, AppleClang 10 (and older) don't trigger availability errors.
18+
// Aligned allocation was not provided before macosx10.14 and as a result we
19+
// get availability errors when the deployment target is older than macosx10.14.
20+
// However, AppleClang 10 (and older) don't trigger availability errors, and
21+
// Clang < 8.0 doesn't warn for 10.13.
22+
// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13
2123
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
2224
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
2325
// 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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@
1515
// FIXME turn this into an XFAIL
1616
// UNSUPPORTED: no-aligned-allocation && !gcc
1717

18-
// Aligned allocation was not provided before macosx10.12 and as a result we
19-
// get availability errors when the deployment target is older than macosx10.13.
20-
// However, AppleClang 10 (and older) don't trigger availability errors.
18+
// Aligned allocation was not provided before macosx10.14 and as a result we
19+
// get availability errors when the deployment target is older than macosx10.14.
20+
// However, AppleClang 10 (and older) don't trigger availability errors, and
21+
// Clang < 8.0 doesn't warn for 10.13.
22+
// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13
2123
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
2224
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
2325
// 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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
// UNSUPPORTED: c++98, c++03, c++11, c++14
1111
// UNSUPPORTED: sanitizer-new-delete
1212

13-
// Aligned allocation was not provided before macosx10.12 and as a result we
14-
// get availability errors when the deployment target is older than macosx10.13.
15-
// However, AppleClang 10 (and older) don't trigger availability errors.
13+
// Aligned allocation was not provided before macosx10.14 and as a result we
14+
// get availability errors when the deployment target is older than macosx10.14.
15+
// However, AppleClang 10 (and older) don't trigger availability errors, and
16+
// Clang < 8.0 doesn't warn for 10.13.
17+
// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13
1618
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
1719
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
1820
// 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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
// None of the current GCC compilers support this.
1717
// UNSUPPORTED: gcc-5, gcc-6
1818

19-
// Aligned allocation was not provided before macosx10.12 and as a result we
20-
// get availability errors when the deployment target is older than macosx10.13.
21-
// However, AppleClang 10 (and older) don't trigger availability errors.
19+
// Aligned allocation was not provided before macosx10.14 and as a result we
20+
// get availability errors when the deployment target is older than macosx10.14.
21+
// However, AppleClang 10 (and older) don't trigger availability errors, and
22+
// Clang < 8.0 doesn't warn for 10.13
23+
// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13
2224
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
2325
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
2426
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

1010
// UNSUPPORTED: c++98, c++03, c++11, c++14
1111

12-
// Aligned allocation was not provided before macosx10.12 and as a result we
13-
// get availability errors when the deployment target is older than macosx10.13.
14-
// However, AppleClang 10 (and older) don't trigger availability errors.
12+
// Aligned allocation was not provided before macosx10.14 and as a result we
13+
// get availability errors when the deployment target is older than macosx10.14.
14+
// However, AppleClang 10 (and older) don't trigger availability errors, and
15+
// Clang < 8.0 doesn't warn for 10.13.
16+
// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13
1517
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
1618
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
1719
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,11 @@
99

1010
// UNSUPPORTED: c++98, c++03, c++11, c++14
1111

12-
// Aligned allocation was not provided before macosx10.12 and as a result we
13-
// get availability errors when the deployment target is older than macosx10.13.
14-
// However, AppleClang 10 (and older) don't trigger availability errors.
12+
// Aligned allocation was not provided before macosx10.14 and as a result we
13+
// get availability errors when the deployment target is older than macosx10.14.
14+
// However, AppleClang 10 (and older) don't trigger availability errors, and
15+
// Clang < 8.0 doesn't warn for 10.13
16+
// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13
1517
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
1618
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
1719
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10

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

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
// UNSUPPORTED: c++98, c++03, c++11, c++14
1111
// UNSUPPORTED: sanitizer-new-delete
1212

13-
// Aligned allocation was not provided before macosx10.12 and as a result we
14-
// get availability errors when the deployment target is older than macosx10.13.
15-
// However, AppleClang 10 (and older) don't trigger availability errors.
13+
// Aligned allocation was not provided before macosx10.14 and as a result we
14+
// get availability errors when the deployment target is older than macosx10.14.
15+
// However, AppleClang 10 (and older) don't trigger availability errors, and
16+
// Clang < 8.0 doesn't warn for 10.13
17+
// XFAIL: !(apple-clang-9 || apple-clang-10 || clang-7) && availability=macosx10.13
1618
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.12
1719
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.11
1820
// XFAIL: !(apple-clang-9 || apple-clang-10) && availability=macosx10.10

0 commit comments

Comments
 (0)