Revert "Revert "Merge to upstream r304942.""

This reverts commit 38a0d5af7e. Test: make checkbuild Test: ./run_tests.py Test: ./run_tests.py --bitness 64
2018-01-17 14:21:02 -08:00
parent 38a0d5af7e
commit c79549b70e
1102 changed files with 19092 additions and 14798 deletions
--- a/test/libcxx/debug/containers/db_string.pass.cpp
+++ b/test/libcxx/debug/containers/db_string.pass.cpp
@@ -12,6 +12,9 @@
 // MODULES_DEFINES: _LIBCPP_DEBUG=1
 // MODULES_DEFINES: _LIBCPP_DEBUG_USE_EXCEPTIONS

+// Can't test the system lib because this test enables debug mode
+// UNSUPPORTED: with_system_cxx_lib
+
 // test container debugging

 #define _LIBCPP_DEBUG 1