summaryrefslogtreecommitdiffstats
path: root/libcxx/test
diff options
context:
space:
mode:
Diffstat (limited to 'libcxx/test')
-rw-r--r--libcxx/test/libcxx/test/config.py1
-rw-r--r--libcxx/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp5
2 files changed, 6 insertions, 0 deletions
diff --git a/libcxx/test/libcxx/test/config.py b/libcxx/test/libcxx/test/config.py
index 21e54bb7fc3..06d3a7bdd81 100644
--- a/libcxx/test/libcxx/test/config.py
+++ b/libcxx/test/libcxx/test/config.py
@@ -226,6 +226,7 @@ class Configuration(object):
'unsupported value for "cxx_stdlib_under_test": %s'
% self.cxx_stdlib_under_test)
if self.cxx_stdlib_under_test == 'libstdc++':
+ self.config.available_features.add('libstdc++')
# Manually enable the experimental and filesystem tests for libstdc++
# if the options aren't present.
# FIXME this is a hack.
diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
index eac7600b5d1..9e20144e8c8 100644
--- a/libcxx/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
+++ b/libcxx/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
@@ -10,6 +10,11 @@
// XFAIL: libcpp-no-exceptions
// UNSUPPORTED: libcpp-has-no-threads
+// This test hangs forever when built against libstdc++. In order to allow
+// validation of the test suite against other STLs we have to mark it
+// unsupported.
+// UNSUPPORTED: libstdc++
+
// <mutex>
// template <class L1, class L2, class... L3>
OpenPOWER on IntegriCloud