summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric Fiselier <eric@efcs.ca>2018-02-15 02:41:19 +0000
committerEric Fiselier <eric@efcs.ca>2018-02-15 02:41:19 +0000
commit6878e852d1d26cca0abee3013822311cd894ca3e (patch)
treea653271b875326d32b941b2c38ff4248380db8ce
parent078dd9752d27dde7f4e05aa70d47ce5324dc9ac8 (diff)
Fix test failure on compilers w/o deduction guides
git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@325205 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp3
-rw-r--r--utils/libcxx/test/config.py3
2 files changed, 3 insertions, 3 deletions
diff --git a/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp b/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp
index a6c458c0e..b83275a57 100644
--- a/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp
+++ b/test/std/strings/basic.string/string.cons/iter_alloc_deduction.pass.cpp
@@ -9,8 +9,7 @@
// <string>
// UNSUPPORTED: c++98, c++03, c++11, c++14
-// UNSUPPORTED: clang-3.3, clang-3.4, clang-3.5, clang-3.6, clang-3.7, clang-3.8, clang-3.9, clang-4.0
-// UNSUPPORTED: apple-clang-6, apple-clang-7, apple-clang-8.0
+// XFAIL: libcpp-no-deduction-guides
// template<class InputIterator>
// basic_string(InputIterator begin, InputIterator end,
diff --git a/utils/libcxx/test/config.py b/utils/libcxx/test/config.py
index 199ff3566..b9e2825db 100644
--- a/utils/libcxx/test/config.py
+++ b/utils/libcxx/test/config.py
@@ -463,7 +463,8 @@ class Configuration(object):
if '__cpp_structured_bindings' not in macros:
self.config.available_features.add('libcpp-no-structured-bindings')
- if '__cpp_deduction_guides' not in macros:
+ if '__cpp_deduction_guides' not in macros or \
+ int(macros['__cpp_deduction_guides']) < 201611:
self.config.available_features.add('libcpp-no-deduction-guides')
if self.is_windows: