diff --git a/libcxx/CMakeLists.txt b/libcxx/CMakeLists.txt --- a/libcxx/CMakeLists.txt +++ b/libcxx/CMakeLists.txt @@ -94,6 +94,11 @@ ${ENABLE_FILESYSTEM_DEFAULT}) option(LIBCXX_INCLUDE_TESTS "Build the libc++ tests." ${LLVM_INCLUDE_TESTS}) option(LIBCXX_ENABLE_PARALLEL_ALGORITHMS "Enable the parallel algorithms library. This requires the PSTL to be available." OFF) +option(LIBCXX_ENABLE_DEBUG_MODE + "Whether to include support for libc++'s debugging mode in the library. + By default, this is turned on. If you turn it off and try to enable the + debug mode when compiling a program against libc++, it will fail to link + since the required support isn't provided in the library." ON) option(LIBCXX_TEST_GDB_PRETTY_PRINTERS "Test gdb pretty printers." OFF) set(LIBCXX_TEST_CONFIG "${CMAKE_CURRENT_SOURCE_DIR}/test/configs/legacy.cfg.in" CACHE STRING "The Lit testing configuration to use when running the tests.") diff --git a/libcxx/cmake/caches/Apple.cmake b/libcxx/cmake/caches/Apple.cmake --- a/libcxx/cmake/caches/Apple.cmake +++ b/libcxx/cmake/caches/Apple.cmake @@ -11,6 +11,7 @@ set(LIBCXX_CXX_ABI libcxxabi CACHE STRING "") set(LIBCXX_ENABLE_NEW_DELETE_DEFINITIONS OFF CACHE BOOL "") set(LIBCXX_HIDE_FROM_ABI_PER_TU_BY_DEFAULT ON CACHE BOOL "") +set(LIBCXX_ENABLE_DEBUG_MODE OFF CACHE BOOL "") set(LIBCXXABI_ENABLE_NEW_DELETE_DEFINITIONS ON CACHE BOOL "") set(LIBCXXABI_ENABLE_PIC OFF CACHE BOOL "") diff --git a/libcxx/cmake/caches/Generic-nodebug.cmake b/libcxx/cmake/caches/Generic-nodebug.cmake new file mode 100644 --- /dev/null +++ b/libcxx/cmake/caches/Generic-nodebug.cmake @@ -0,0 +1 @@ +set(LIBCXX_ENABLE_DEBUG_MODE OFF CACHE BOOL "") diff --git a/libcxx/src/CMakeLists.txt b/libcxx/src/CMakeLists.txt --- a/libcxx/src/CMakeLists.txt +++ b/libcxx/src/CMakeLists.txt @@ -11,7 +11,6 @@ chrono.cpp condition_variable.cpp condition_variable_destructor.cpp - debug.cpp exception.cpp functional.cpp future.cpp @@ -56,6 +55,10 @@ vector.cpp ) +if (LIBCXX_ENABLE_DEBUG_MODE) + list(APPEND LIBCXX_SOURCES debug.cpp) +endif() + if(WIN32) list(APPEND LIBCXX_SOURCES support/win32/locale_win32.cpp diff --git a/libcxx/test/CMakeLists.txt b/libcxx/test/CMakeLists.txt --- a/libcxx/test/CMakeLists.txt +++ b/libcxx/test/CMakeLists.txt @@ -70,6 +70,7 @@ pythonize_bool(LIBCXX_HAVE_CXX_ATOMICS_WITH_LIB) pythonize_bool(LIBCXX_BUILD_EXTERNAL_THREAD_LIBRARY) pythonize_bool(LIBCXX_DEBUG_BUILD) +pythonize_bool(LIBCXX_ENABLE_DEBUG_MODE) pythonize_bool(LIBCXX_ENABLE_PARALLEL_ALGORITHMS) # By default, for non-standalone builds, libcxx and libcxxabi share a library diff --git a/libcxx/test/configs/legacy.cfg.in b/libcxx/test/configs/legacy.cfg.in --- a/libcxx/test/configs/legacy.cfg.in +++ b/libcxx/test/configs/legacy.cfg.in @@ -9,6 +9,7 @@ config.libcxx_obj_root = "@LIBCXX_BINARY_DIR@" config.cxx_library_root = "@LIBCXX_LIBRARY_DIR@" config.enable_exceptions = @LIBCXX_ENABLE_EXCEPTIONS@ +config.enable_debug_tests = @LIBCXX_ENABLE_DEBUG_MODE@ config.enable_experimental = @LIBCXX_ENABLE_EXPERIMENTAL_LIBRARY@ config.enable_filesystem = @LIBCXX_ENABLE_FILESYSTEM@ config.enable_rtti = @LIBCXX_ENABLE_RTTI@ diff --git a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_back.pass.cpp @@ -9,9 +9,7 @@ // UNSUPPORTED: windows // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 - -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode // test array::front() raises a debug error. diff --git a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_front.pass.cpp @@ -9,9 +9,7 @@ // UNSUPPORTED: windows // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 - -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode // test array::front() raises a debug error. diff --git a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/array/array.zero/db_indexing.pass.cpp @@ -9,9 +9,7 @@ // UNSUPPORTED: windows // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 - -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode // test array::operator[] raises a debug error. diff --git a/libcxx/test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.cons/db_copy.pass.cpp @@ -7,11 +7,11 @@ //===----------------------------------------------------------------------===// // -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx // list(list&& c); +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.cons/db_move.pass.cpp @@ -6,15 +6,13 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: c++03 - -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // list(list&& c); +// UNSUPPORTED: c++03 +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(1)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/emplace_db1.pass.cpp @@ -6,15 +6,13 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: c++03 - -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // template void emplace(const_iterator p, Args&&... args); +// UNSUPPORTED: c++03 +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db1.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // Call erase(const_iterator position) with end() +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_db2.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // Call erase(const_iterator position) with iterator from another container +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db1.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // Call erase(const_iterator first, const_iterator last); with first iterator from another container +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db2.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // Call erase(const_iterator first, const_iterator last); with second iterator from another container +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db3.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // Call erase(const_iterator first, const_iterator last); with both iterators from another container +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/erase_iter_iter_db4.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // Call erase(const_iterator first, const_iterator last); with a bad range +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_iter_iter_db1.pass.cpp @@ -6,14 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // template // iterator insert(const_iterator position, Iter first, Iter last); +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_rvalue_db1.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // iterator insert(const_iterator position, value_type&& x); +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_size_value_db1.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // iterator insert(const_iterator position, size_type n, const value_type& x); +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/insert_iter_value_db1.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // iterator insert(const_iterator position, const value_type& x); +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.modifiers/pop_back_db1.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // void pop_back(); +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // void splice(const_iterator position, list& x); +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // void splice(const_iterator position, list& x, iterator i); +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/list/list.ops/db_splice_pos_list_iter_iter.pass.cpp @@ -6,13 +6,12 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // // void splice(const_iterator position, list& x, iterator first, iterator last); +// UNSUPPORTED: libcxx-no-debug-mode + #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_back.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_back.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_back.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_back.pass.cpp @@ -10,8 +10,7 @@ // Call back() on empty container. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_cback.pass.cpp @@ -10,8 +10,7 @@ // Call back() on empty const container. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_cfront.pass.cpp @@ -10,8 +10,7 @@ // Call front() on empty const container. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_cindex.pass.cpp @@ -10,8 +10,7 @@ // Index const vector out of bounds. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_front.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_front.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_front.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_front.pass.cpp @@ -10,8 +10,7 @@ // Call front() on empty container. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_index.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_index.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_index.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_index.pass.cpp @@ -10,8 +10,7 @@ // Index vector out of bounds. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_2.pass.cpp @@ -10,8 +10,7 @@ // Compare iterators from different containers with <. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_3.pass.cpp @@ -10,8 +10,7 @@ // Subtract iterators from different containers. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_4.pass.cpp @@ -10,8 +10,7 @@ // Index iterator out of bounds. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_5.pass.cpp @@ -10,8 +10,7 @@ // Add to iterator out of bounds. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_6.pass.cpp @@ -10,8 +10,7 @@ // Decrement iterator prior to begin. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/db_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/sequences/vector/pop_back_empty.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/pop_back_empty.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/pop_back_empty.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/pop_back_empty.pass.cpp @@ -10,8 +10,7 @@ // pop_back() more than the number of elements in a vector -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/db_bucket.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/db_bucket.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/db_bucket.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/db_bucket.pass.cpp @@ -10,8 +10,7 @@ // size_type bucket(const key_type& __k) const; -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/db_insert_hint_const_lvalue.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/db_insert_hint_const_lvalue.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/db_insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/db_insert_hint_const_lvalue.pass.cpp @@ -10,8 +10,7 @@ // iterator insert(const_iterator p, const value_type& x); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/db_insert_hint_rvalue.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/db_insert_hint_rvalue.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/db_insert_hint_rvalue.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/db_insert_hint_rvalue.pass.cpp @@ -14,8 +14,7 @@ // class = typename enable_if::value>::type> // iterator insert(const_iterator p, P&& x); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/db_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/db_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/db_local_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment local_iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/db_local_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/db_move.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/db_move.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/db_move.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/db_move.pass.cpp @@ -11,9 +11,7 @@ // unordered_map(unordered_map&& u); // UNSUPPORTED: c++03 - -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with end() -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db3.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db3.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db4.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.modifiers/erase_iter_iter_db4.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/unord.map.swap/db_swap_1.pass.cpp @@ -14,8 +14,7 @@ // void swap(unordered_map& x, unordered_map& y); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/db_insert_hint_const_lvalue.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/db_insert_hint_const_lvalue.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/db_insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/db_insert_hint_const_lvalue.pass.cpp @@ -10,8 +10,7 @@ // iterator insert(const_iterator p, const value_type& x); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/db_insert_hint_rvalue.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/db_insert_hint_rvalue.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/db_insert_hint_rvalue.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/db_insert_hint_rvalue.pass.cpp @@ -14,8 +14,7 @@ // class = typename enable_if::value>::type> // iterator insert(const_iterator p, P&& x); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/db_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/db_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/db_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/db_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/db_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/db_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/db_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/db_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/db_local_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment local_iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/db_local_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/db_move.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/db_move.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/db_move.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/db_move.pass.cpp @@ -12,8 +12,7 @@ // unordered_multimap(unordered_multimap&& u); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with end() -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db3.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.modifiers/erase_iter_iter_db4.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multimap/unord.multimap.swap/db_swap_1.pass.cpp @@ -14,8 +14,7 @@ // void swap(unordered_multimap& x, unordered_multimap& y); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/db_insert_hint_const_lvalue.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/db_insert_hint_const_lvalue.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/db_insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/db_insert_hint_const_lvalue.pass.cpp @@ -10,8 +10,7 @@ // iterator insert(const_iterator p, const value_type& x); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/db_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/db_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/db_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/db_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/db_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/db_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/db_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/db_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/db_local_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment local_iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/db_local_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/db_move.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/db_move.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/db_move.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/db_move.pass.cpp @@ -12,8 +12,7 @@ // unordered_multiset(unordered_multiset&& u); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with end() -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db3.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/erase_iter_iter_db4.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.multiset/unord.multiset.swap/db_swap_1.pass.cpp @@ -14,8 +14,7 @@ // void swap(unordered_multiset& x, unordered_multiset& y); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/db_insert_hint_const_lvalue.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/db_insert_hint_const_lvalue.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/db_insert_hint_const_lvalue.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/db_insert_hint_const_lvalue.pass.cpp @@ -10,8 +10,7 @@ // iterator insert(const_iterator p, const value_type& x); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/db_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/db_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/db_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/db_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/db_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/db_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/db_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/db_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/db_local_iterators_7.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/db_local_iterators_7.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/db_local_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/db_local_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment local_iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/db_local_iterators_8.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/db_local_iterators_8.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/db_local_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/db_local_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/db_move.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/db_move.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/db_move.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/db_move.pass.cpp @@ -7,14 +7,12 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++03 +// UNSUPPORTED: libcxx-no-debug-mode // // unordered_set(unordered_set&& u); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx - #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with end() -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db3.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/erase_iter_iter_db4.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.set/unord.set.swap/db_swap_1.pass.cpp @@ -14,8 +14,7 @@ // void swap(unordered_set& x, unordered_set& y); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp b/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_associative_container_tests.pass.cpp @@ -9,10 +9,9 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows // UNSUPPORTED: libcpp-no-if-constexpr -// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 +// UNSUPPORTED: libcxx-no-debug-mode // test container debugging diff --git a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.multithread.pass.cpp @@ -10,10 +10,9 @@ // UNSUPPORTED: windows // UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: libcpp-no-if-constexpr -// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 +// UNSUPPORTED: libcxx-no-debug-mode // test multihtreaded container debugging diff --git a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_sequence_container_iterators.pass.cpp @@ -9,10 +9,9 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows // UNSUPPORTED: libcpp-no-if-constexpr -// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 +// UNSUPPORTED: libcxx-no-debug-mode // test container debugging diff --git a/libcxx/test/libcxx/debug/containers/db_string.pass.cpp b/libcxx/test/libcxx/debug/containers/db_string.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_string.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_string.pass.cpp @@ -9,10 +9,9 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows // UNSUPPORTED: libcpp-no-if-constexpr -// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 +// UNSUPPORTED: libcxx-no-debug-mode // test container debugging diff --git a/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp b/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp --- a/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp +++ b/libcxx/test/libcxx/debug/containers/db_unord_container_tests.pass.cpp @@ -9,10 +9,9 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows // UNSUPPORTED: libcpp-no-if-constexpr -// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 +// UNSUPPORTED: libcxx-no-debug-mode // test container debugging diff --git a/libcxx/test/libcxx/debug/db_string_view.pass.cpp b/libcxx/test/libcxx/debug/db_string_view.pass.cpp --- a/libcxx/test/libcxx/debug/db_string_view.pass.cpp +++ b/libcxx/test/libcxx/debug/db_string_view.pass.cpp @@ -9,10 +9,9 @@ // UNSUPPORTED: c++03, c++11, c++14 // UNSUPPORTED: windows // UNSUPPORTED: libcpp-no-if-constexpr -// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 +// UNSUPPORTED: libcxx-no-debug-mode // test container debugging diff --git a/libcxx/test/libcxx/debug/debug_abort.pass.cpp b/libcxx/test/libcxx/debug/debug_abort.pass.cpp --- a/libcxx/test/libcxx/debug/debug_abort.pass.cpp +++ b/libcxx/test/libcxx/debug/debug_abort.pass.cpp @@ -8,9 +8,7 @@ //===----------------------------------------------------------------------===// // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 - -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode // Test that the default debug handler aborts the program. diff --git a/libcxx/test/libcxx/debug/debug_helper_test.pass.cpp b/libcxx/test/libcxx/debug/debug_helper_test.pass.cpp --- a/libcxx/test/libcxx/debug/debug_helper_test.pass.cpp +++ b/libcxx/test/libcxx/debug/debug_helper_test.pass.cpp @@ -10,10 +10,8 @@ // UNSUPPORTED: c++03 // UNSUPPORTED: windows -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 +// UNSUPPORTED: libcxx-no-debug-mode #include <__debug> #include "test_macros.h" diff --git a/libcxx/test/libcxx/debug/debug_register.pass.cpp b/libcxx/test/libcxx/debug/debug_register.pass.cpp --- a/libcxx/test/libcxx/debug/debug_register.pass.cpp +++ b/libcxx/test/libcxx/debug/debug_register.pass.cpp @@ -8,9 +8,7 @@ //===----------------------------------------------------------------------===// // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=1 - -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #include #include diff --git a/libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/iterator_db.pass.cpp b/libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/iterator_db.pass.cpp --- a/libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/iterator_db.pass.cpp +++ b/libcxx/test/libcxx/input.output/filesystems/class.path/path.itr/iterator_db.pass.cpp @@ -8,12 +8,10 @@ // UNSUPPORTED: c++03 // UNSUPPORTED: windows +// UNSUPPORTED: libcxx-no-debug-mode // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx - // // class path diff --git a/libcxx/test/libcxx/iterators/advance.debug1.pass.cpp b/libcxx/test/libcxx/iterators/advance.debug1.pass.cpp --- a/libcxx/test/libcxx/iterators/advance.debug1.pass.cpp +++ b/libcxx/test/libcxx/iterators/advance.debug1.pass.cpp @@ -6,11 +6,10 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode // UNSUPPORTED: c++03 // UNSUPPORTED: windows -// UNSUPPORTED: with_system_cxx_lib=macosx // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 +// UNSUPPORTED: libcxx-no-debug-mode // diff --git a/libcxx/test/libcxx/iterators/next.debug1.pass.cpp b/libcxx/test/libcxx/iterators/next.debug1.pass.cpp --- a/libcxx/test/libcxx/iterators/next.debug1.pass.cpp +++ b/libcxx/test/libcxx/iterators/next.debug1.pass.cpp @@ -6,11 +6,10 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode // UNSUPPORTED: c++03 // UNSUPPORTED: windows -// UNSUPPORTED: with_system_cxx_lib=macosx // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 +// UNSUPPORTED: libcxx-no-debug-mode // diff --git a/libcxx/test/libcxx/iterators/prev.debug1.pass.cpp b/libcxx/test/libcxx/iterators/prev.debug1.pass.cpp --- a/libcxx/test/libcxx/iterators/prev.debug1.pass.cpp +++ b/libcxx/test/libcxx/iterators/prev.debug1.pass.cpp @@ -6,12 +6,10 @@ // //===----------------------------------------------------------------------===// -// Can't test the system lib because this test enables debug mode -// UNSUPPORTED: with_system_cxx_lib=macosx - // UNSUPPORTED: c++03 // UNSUPPORTED: windows // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 +// UNSUPPORTED: libcxx-no-debug-mode // diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_back.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_back.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.access/db_back.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_back.pass.cpp @@ -10,8 +10,7 @@ // Call back() on empty container. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cback.pass.cpp @@ -10,8 +10,7 @@ // Call back() on empty const container. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cfront.pass.cpp @@ -10,8 +10,7 @@ // Call front() on empty const container. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_cindex.pass.cpp @@ -10,8 +10,7 @@ // Index const string out of bounds. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_front.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_front.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.access/db_front.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_front.pass.cpp @@ -10,8 +10,7 @@ // Call front() on empty container. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.access/db_index.pass.cpp @@ -10,8 +10,7 @@ // Index string out of bounds. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_2.pass.cpp @@ -10,8 +10,7 @@ // Compare iterators from different containers with <. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_3.pass.cpp @@ -10,8 +10,7 @@ // Subtract iterators from different containers with <. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_4.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_4.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_4.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_4.pass.cpp @@ -10,8 +10,7 @@ // Index iterator out of bounds. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_5.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_5.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_5.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_5.pass.cpp @@ -10,8 +10,7 @@ // Add to iterator out of bounds. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_6.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_6.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_6.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_6.pass.cpp @@ -10,8 +10,7 @@ // Decrement iterator prior to begin. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_7.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_7.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_7.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_7.pass.cpp @@ -10,8 +10,7 @@ // Increment iterator past end. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.iterators/db_iterators_8.pass.cpp @@ -10,8 +10,7 @@ // Dereference non-dereferenceable iterator. -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/clear_and_shrink_db1.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/clear_and_shrink_db1.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/clear_and_shrink_db1.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/clear_and_shrink_db1.pass.cpp @@ -10,8 +10,7 @@ // Call __clear_and_shrink() and ensure string invariants hold -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with end() -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator position) with iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db1.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with first iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db2.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with second iterator from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db3.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with both iterators from another container -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_iter_iter_db4.pass.cpp @@ -10,8 +10,7 @@ // Call erase(const_iterator first, const_iterator last); with a bad range -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_pop_back_db1.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_pop_back_db1.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_pop_back_db1.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/erase_pop_back_db1.pass.cpp @@ -10,8 +10,7 @@ // void pop_back(); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_char_db1.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_char_db1.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_char_db1.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_char_db1.pass.cpp @@ -10,8 +10,7 @@ // iterator insert(const_iterator p, charT c); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_iter_iter_db1.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_iter_iter_db1.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_iter_iter_db1.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_iter_iter_db1.pass.cpp @@ -11,8 +11,7 @@ // template // iterator insert(const_iterator p, InputIterator first, InputIterator last); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_size_char_db1.pass.cpp b/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_size_char_db1.pass.cpp --- a/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_size_char_db1.pass.cpp +++ b/libcxx/test/libcxx/strings/basic.string/string.modifiers/insert_iter_size_char_db1.pass.cpp @@ -10,8 +10,7 @@ // iterator insert(const_iterator p, size_type n, charT c); -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx +// UNSUPPORTED: libcxx-no-debug-mode #define _LIBCPP_DEBUG 1 #define _LIBCPP_ASSERT(x, m) ((x) ? (void)0 : std::exit(0)) diff --git a/libcxx/test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp b/libcxx/test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp --- a/libcxx/test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp +++ b/libcxx/test/libcxx/thread/futures/futures.promise/set_exception.pass.cpp @@ -9,12 +9,10 @@ // UNSUPPORTED: windows // UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: c++03 +// UNSUPPORTED: libcxx-no-debug-mode // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx - // // class promise diff --git a/libcxx/test/libcxx/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp b/libcxx/test/libcxx/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp --- a/libcxx/test/libcxx/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp +++ b/libcxx/test/libcxx/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp @@ -9,12 +9,10 @@ // UNSUPPORTED: windows // UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: c++03 +// UNSUPPORTED: libcxx-no-debug-mode // ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_DEBUG=0 -// This test requires debug mode, which the library on macOS doesn't have. -// UNSUPPORTED: with_system_cxx_lib=macosx - // // class promise diff --git a/libcxx/utils/ci/buildkite-pipeline.yml b/libcxx/utils/ci/buildkite-pipeline.yml --- a/libcxx/utils/ci/buildkite-pipeline.yml +++ b/libcxx/utils/ci/buildkite-pipeline.yml @@ -75,6 +75,11 @@ agents: queue: "libcxx-builders" + - label: "No debug mode" + command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-nodebug | libcxx/utils/ci/phabricator-report" + agents: + queue: "libcxx-builders" + - label: "MacOS C++20" command: "set -o pipefail && libcxx/utils/ci/run-buildbot.sh generic-cxx2a | libcxx/utils/ci/phabricator-report" agents: diff --git a/libcxx/utils/ci/macos-backdeployment.sh b/libcxx/utils/ci/macos-backdeployment.sh --- a/libcxx/utils/ci/macos-backdeployment.sh +++ b/libcxx/utils/ci/macos-backdeployment.sh @@ -131,6 +131,7 @@ echo "@@@ Running tests for libc++ @@@" "${LLVM_BUILD_DIR}/bin/llvm-lit" -sv "${MONOREPO_ROOT}/libcxx/test" \ --param=enable_experimental=false \ + --param=enable_debug_tests=false \ ${ENABLE_FILESYSTEM} \ --param=cxx_headers="${LLVM_INSTALL_DIR}/include/c++/v1" \ --param=std="${STD}" \ diff --git a/libcxx/utils/ci/run-buildbot.sh b/libcxx/utils/ci/run-buildbot.sh --- a/libcxx/utils/ci/run-buildbot.sh +++ b/libcxx/utils/ci/run-buildbot.sh @@ -102,6 +102,12 @@ args+=("-DLIBCXXABI_ENABLE_THREADS=OFF") args+=("-DLIBCXX_ENABLE_MONOTONIC_CLOCK=OFF") ;; +generic-nodebug) + export CC=clang + export CXX=clang++ + args+=("-DLLVM_LIT_ARGS=-sv --show-unsupported") + args+=("-DLIBCXX_ENABLE_DEBUG_MODE=OFF") +;; x86_64-apple-system) export CC=clang export CXX=clang++ diff --git a/libcxx/utils/libcxx/test/params.py b/libcxx/utils/libcxx/test/params.py --- a/libcxx/utils/libcxx/test/params.py +++ b/libcxx/utils/libcxx/test/params.py @@ -45,6 +45,10 @@ Feature(name='c++experimental', linkFlag='-lc++experimental')), Parameter(name='long_tests', choices=[True, False], type=bool, default=True, - help="Whether to tests that take longer to run. This can be useful when running on a very slow device.", + help="Whether to enable tests that take longer to run. This can be useful when running on a very slow device.", feature=lambda enabled: Feature(name='long_tests') if enabled else None), + + Parameter(name='enable_debug_tests', choices=[True, False], type=bool, default=True, + help="Whether to enable tests that exercise the libc++ debugging mode.", + feature=lambda enabled: None if enabled else Feature(name='libcxx-no-debug-mode')), ]