diff options
| author | Eric Fiselier <eric@efcs.ca> | 2020-04-08 18:25:01 -0400 |
|---|---|---|
| committer | Eric Fiselier <eric@efcs.ca> | 2020-04-08 18:25:07 -0400 |
| commit | bf90b8fc25ca0fc112c4beacbc9090980c9c7295 (patch) | |
| tree | 96fe5744f406977f823a6b5d34b839bd40abbf45 | |
| parent | 155740cc33a4b637d110216e229401d81987ed3d (diff) | |
| download | llvm-bf90b8fc25ca0fc112c4beacbc9090980c9c7295.zip llvm-bf90b8fc25ca0fc112c4beacbc9090980c9c7295.tar.gz llvm-bf90b8fc25ca0fc112c4beacbc9090980c9c7295.tar.bz2 | |
[libc++] Fix failing concepts tests
| -rw-r--r-- | libcxx/test/std/concepts/lang/same_as.pass.cpp | 1 | ||||
| -rw-r--r-- | libcxx/utils/libcxx/test/config.py | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/libcxx/test/std/concepts/lang/same_as.pass.cpp b/libcxx/test/std/concepts/lang/same_as.pass.cpp index c41d6c4..76e019d 100644 --- a/libcxx/test/std/concepts/lang/same_as.pass.cpp +++ b/libcxx/test/std/concepts/lang/same_as.pass.cpp @@ -7,6 +7,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03, c++11, c++14, c++17 +// UNSUPPORTED: libcpp-no-concepts // template<class T, class U> // concept same_as; diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py index 88010f8..b29910a 100644 --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -472,6 +472,10 @@ class Configuration(object): intMacroValue(macros['__cpp_deduction_guides']) < 201611: self.config.available_features.add('libcpp-no-deduction-guides') + if '__cpp_concepts' not in macros or \ + intMacroValue(macros['__cpp_concepts']) < 201811: + self.config.available_features.add('libcpp-no-concepts') + if self.target_info.is_windows(): self.config.available_features.add('windows') if self.cxx_stdlib_under_test == 'libc++': |