Skip to content

Commit c360553

Browse files
ldionneldionne
committed
[runtimes] Simplify how we specify XFAIL & friends based on the triple
Now that Lit supports regular expressions inside XFAIL & friends, it is much easier to write Lit annotations based on the triple. Differential Revision: https://reviews.llvm.org/D104747
1 parent a319eaf commit c360553

File tree

252 files changed

+260
-1141
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

252 files changed

+260
-1141
lines changed

‎libcxx/test/libcxx/language.support/cxa_deleted_virtual.pass.cpp‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,7 @@
1111
// Test exporting the symbol: "__cxa_deleted_virtual" in macosx
1212
// But don't expect the symbol to be exported in previous versions.
1313
//
14-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.14
15-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13
16-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12
17-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11
18-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10
19-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9
14+
// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}}
2015

2116
struct S { virtual void f() = delete; virtual ~S() {} };
2217
int main(int, char**) {

‎libcxx/test/libcxx/language.support/support.dynamic/aligned_alloc_availability.verify.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,7 @@
1616
// UNSUPPORTED: apple-clang-9, apple-clang-10
1717
// UNSUPPORTED: clang-5, clang-6, clang-7
1818

19-
// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.13 || \
20-
// REQUIRES: x86_64-apple-macosx10.12 || \
21-
// REQUIRES: x86_64-apple-macosx10.11 || \
22-
// REQUIRES: x86_64-apple-macosx10.10 || \
23-
// REQUIRES: x86_64-apple-macosx10.9)
19+
// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}}
2420

2521
#include <new>
2622
#include <cstddef>

‎libcxx/test/libcxx/language.support/support.dynamic/libcpp_deallocate.sh.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
// The dylibs shipped before macosx10.13 do not contain the aligned allocation
1717
// functions, so trying to force using those with -faligned-allocation results
1818
// in a link error.
19-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12
20-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11
21-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10
22-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9
19+
// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}}
2320

2421
// AppleClang < 10 incorrectly warns that aligned allocation is not supported
2522
// even when it is supported.

‎libcxx/test/libcxx/language.support/support.dynamic/new_faligned_allocation.pass.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,7 @@
1616
// The dylibs shipped before macosx10.13 do not contain the aligned allocation
1717
// functions, so trying to force using those with -faligned-allocation results
1818
// in a link error.
19-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12
20-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11
21-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10
22-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9
19+
// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}}
2320

2421
// REQUIRES: -faligned-allocation
2522
// ADDITIONAL_COMPILE_FLAGS: -faligned-allocation

‎libcxx/test/libcxx/memory/aligned_allocation_macro.compile.pass.cpp‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,7 @@
1515
// GCC 5 doesn't support aligned allocation
1616
// UNSUPPORTED: gcc-5
1717

18-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.13
19-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.12
20-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.11
21-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.10
22-
// XFAIL: use_system_cxx_lib && x86_64-apple-macosx10.9
18+
// XFAIL: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13}}
2319

2420
#include <new>
2521

‎libcxx/test/libcxx/thread/atomic.availability.verify.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// UNSUPPORTED: c++03, c++11
10-
// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \
11-
// REQUIRES: x86_64-apple-macosx10.10 || \
12-
// REQUIRES: x86_64-apple-macosx10.11 || \
13-
// REQUIRES: x86_64-apple-macosx10.12 || \
14-
// REQUIRES: x86_64-apple-macosx10.13 || \
15-
// REQUIRES: x86_64-apple-macosx10.14 || \
16-
// REQUIRES: x86_64-apple-macosx10.15)
10+
// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}}
1711

1812

1913
// Test the availability markup on the C++20 Synchronization Library

‎libcxx/test/libcxx/thread/barrier.availability.verify.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// UNSUPPORTED: c++03, c++11
10-
// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \
11-
// REQUIRES: x86_64-apple-macosx10.10 || \
12-
// REQUIRES: x86_64-apple-macosx10.11 || \
13-
// REQUIRES: x86_64-apple-macosx10.12 || \
14-
// REQUIRES: x86_64-apple-macosx10.13 || \
15-
// REQUIRES: x86_64-apple-macosx10.14 || \
16-
// REQUIRES: x86_64-apple-macosx10.15)
10+
// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}}
1711

1812

1913
// Test the availability markup on std::barrier.

‎libcxx/test/libcxx/thread/latch.availability.verify.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// UNSUPPORTED: c++03, c++11
10-
// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \
11-
// REQUIRES: x86_64-apple-macosx10.10 || \
12-
// REQUIRES: x86_64-apple-macosx10.11 || \
13-
// REQUIRES: x86_64-apple-macosx10.12 || \
14-
// REQUIRES: x86_64-apple-macosx10.13 || \
15-
// REQUIRES: x86_64-apple-macosx10.14 || \
16-
// REQUIRES: x86_64-apple-macosx10.15)
10+
// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}}
1711

1812

1913
// Test the availability markup on std::latch.

‎libcxx/test/libcxx/thread/semaphore.availability.verify.cpp‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,7 @@
77
//===----------------------------------------------------------------------===//
88

99
// UNSUPPORTED: c++03, c++11
10-
// REQUIRES: use_system_cxx_lib && (x86_64-apple-macosx10.9 || \
11-
// REQUIRES: x86_64-apple-macosx10.10 || \
12-
// REQUIRES: x86_64-apple-macosx10.11 || \
13-
// REQUIRES: x86_64-apple-macosx10.12 || \
14-
// REQUIRES: x86_64-apple-macosx10.13 || \
15-
// REQUIRES: x86_64-apple-macosx10.14 || \
16-
// REQUIRES: x86_64-apple-macosx10.15)
10+
// REQUIRES: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12|13|14|15}}
1711

1812

1913
// Test the availability markup on std::counting_semaphore and std::binary_semaphore.

‎libcxx/test/libcxx/thread/thread.condition/PR30202_notify_from_pthread_created_thread.pass.cpp‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
// UNSUPPORTED: c++03
1515

1616
// PR30202 was fixed starting in macosx10.13.
17-
// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.12
18-
// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.11
19-
// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.10
20-
// UNSUPPORTED: use_system_cxx_lib && x86_64-apple-macosx10.9
17+
// UNSUPPORTED: use_system_cxx_lib && target={{.+}}-apple-macosx10.{{9|10|11|12}}
2118

2219
// <condition_variable>
2320

0 commit comments

Comments
 (0)