[libcxx] r283975 - Prevent the test suite from hanging when run against libstdc++

[Eric Fiselier via cfe-commits]

Author: ericwf
Date: Tue Oct 11 23:29:50 2016
New Revision: 283975

URL: http://llvm.org/viewvc/llvm-project?rev=283975&view=rev
Log:
Prevent the test suite from hanging when run against libstdc++

Modified:
    libcxx/trunk/test/libcxx/test/config.py
    libcxx/trunk/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp

Modified: libcxx/trunk/test/libcxx/test/config.py
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/libcxx/test/config.py?rev=283975&r1=283974&r2=283975&view=diff
==============================================================================
--- libcxx/trunk/test/libcxx/test/config.py (original)
+++ libcxx/trunk/test/libcxx/test/config.py Tue Oct 11 23:29:50 2016
@@ -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.

Modified: libcxx/trunk/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp
URL: http://llvm.org/viewvc/llvm-project/libcxx/trunk/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp?rev=283975&r1=283974&r2=283975&view=diff
==============================================================================
--- libcxx/trunk/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp (original)
+++ libcxx/trunk/test/std/thread/thread.mutex/thread.lock.algorithm/lock.pass.cpp Tue Oct 11 23:29:50 2016
@@ -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>