diff --git a/libcxx/test/libcxx/algorithms/debug_less.pass.cpp b/libcxx/test/libcxx/algorithms/debug_less.pass.cpp --- a/libcxx/test/libcxx/algorithms/debug_less.pass.cpp +++ b/libcxx/test/libcxx/algorithms/debug_less.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // diff --git a/libcxx/test/libcxx/containers/associative/map/at.abort.pass.cpp b/libcxx/test/libcxx/containers/associative/map/at.abort.pass.cpp --- a/libcxx/test/libcxx/containers/associative/map/at.abort.pass.cpp +++ b/libcxx/test/libcxx/containers/associative/map/at.abort.pass.cpp @@ -15,7 +15,7 @@ // Make sure we abort() when exceptions are disabled and we fetch a key that // is not in the map. -// REQUIRES: libcpp-no-exceptions +// REQUIRES: no-exceptions #include #include diff --git a/libcxx/test/libcxx/containers/associative/map/at.const.abort.pass.cpp b/libcxx/test/libcxx/containers/associative/map/at.const.abort.pass.cpp --- a/libcxx/test/libcxx/containers/associative/map/at.const.abort.pass.cpp +++ b/libcxx/test/libcxx/containers/associative/map/at.const.abort.pass.cpp @@ -15,7 +15,7 @@ // Make sure we abort() when exceptions are disabled and we fetch a key that // is not in the map. -// REQUIRES: libcpp-no-exceptions +// REQUIRES: no-exceptions #include #include diff --git a/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp --- a/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp +++ b/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // Test asan vector annotations with a class that throws in a CTOR. #include diff --git a/libcxx/test/libcxx/containers/unord/unord.map/at.abort.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/at.abort.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/at.abort.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/at.abort.pass.cpp @@ -15,7 +15,7 @@ // Make sure we abort() when exceptions are disabled and we fetch a key that // is not in the map. -// REQUIRES: libcpp-no-exceptions +// REQUIRES: no-exceptions // UNSUPPORTED: c++98, c++03 #include diff --git a/libcxx/test/libcxx/containers/unord/unord.map/at.const.abort.pass.cpp b/libcxx/test/libcxx/containers/unord/unord.map/at.const.abort.pass.cpp --- a/libcxx/test/libcxx/containers/unord/unord.map/at.const.abort.pass.cpp +++ b/libcxx/test/libcxx/containers/unord/unord.map/at.const.abort.pass.cpp @@ -15,7 +15,7 @@ // Make sure we abort() when exceptions are disabled and we fetch a key that // is not in the map. -// REQUIRES: libcpp-no-exceptions +// REQUIRES: no-exceptions // UNSUPPORTED: c++98, c++03 #include diff --git a/libcxx/test/libcxx/input.output/iostreams.base/ios/iostate.flags/clear.abort.pass.cpp b/libcxx/test/libcxx/input.output/iostreams.base/ios/iostate.flags/clear.abort.pass.cpp --- a/libcxx/test/libcxx/input.output/iostreams.base/ios/iostate.flags/clear.abort.pass.cpp +++ b/libcxx/test/libcxx/input.output/iostreams.base/ios/iostate.flags/clear.abort.pass.cpp @@ -15,7 +15,7 @@ // Make sure that we abort() when exceptions are disabled and the exception // flag is set for the iostate we pass to clear(). -// REQUIRES: libcpp-no-exceptions +// REQUIRES: no-exceptions #include #include diff --git a/libcxx/test/libcxx/localization/locales/locale.abort.pass.cpp b/libcxx/test/libcxx/localization/locales/locale.abort.pass.cpp --- a/libcxx/test/libcxx/localization/locales/locale.abort.pass.cpp +++ b/libcxx/test/libcxx/localization/locales/locale.abort.pass.cpp @@ -12,7 +12,7 @@ // explicit locale( const char* std_name ); -// REQUIRES: libcpp-no-exceptions +// REQUIRES: no-exceptions // Make sure we abort() when we construct a locale with a null name and // exceptions are disabled. diff --git a/libcxx/test/libcxx/localization/locales/locale.category.abort.pass.cpp b/libcxx/test/libcxx/localization/locales/locale.category.abort.pass.cpp --- a/libcxx/test/libcxx/localization/locales/locale.category.abort.pass.cpp +++ b/libcxx/test/libcxx/localization/locales/locale.category.abort.pass.cpp @@ -12,7 +12,7 @@ // locale(const locale& other, const char* std_name, category cat); -// REQUIRES: libcpp-no-exceptions +// REQUIRES: no-exceptions // Make sure we abort() when we construct a locale with a null name and // exceptions are disabled. diff --git a/libcxx/test/libcxx/localization/locales/use_facet.abort.pass.cpp b/libcxx/test/libcxx/localization/locales/use_facet.abort.pass.cpp --- a/libcxx/test/libcxx/localization/locales/use_facet.abort.pass.cpp +++ b/libcxx/test/libcxx/localization/locales/use_facet.abort.pass.cpp @@ -10,7 +10,7 @@ // template const Facet& use_facet(const locale& loc); -// REQUIRES: libcpp-no-exceptions +// REQUIRES: no-exceptions // Make sure we abort() when we pass a facet not associated to the locale to // use_facet() and exceptions are disabled. diff --git a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp --- a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp +++ b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp @@ -27,7 +27,7 @@ #ifndef TEST_HAS_NO_EXCEPTIONS static const bool expected = false; #else -// Under libcpp-no-exceptions all noexcept expressions are trivially true, so +// Under -fno-exceptions all noexcept expressions are trivially true, so // any check for a noexcept returning false must actually check for it being // true. static const bool expected = true; diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // void push_back(const value_type& x); diff --git a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp --- a/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp +++ b/libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // void push_front(const value_type& x); diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp --- a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp +++ b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // void push_front(const value_type& x); diff --git a/libcxx/test/std/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp b/libcxx/test/std/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp --- a/libcxx/test/std/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // void push_back(const value_type& x); diff --git a/libcxx/test/std/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp b/libcxx/test/std/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp --- a/libcxx/test/std/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp +++ b/libcxx/test/std/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // void push_front(const value_type& x); diff --git a/libcxx/test/std/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp b/libcxx/test/std/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp --- a/libcxx/test/std/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // This test fails due to a stack overflow // XFAIL: LIBCXX-WINDOWS-FIXME diff --git a/libcxx/test/std/language.support/support.exception/except.nested/rethrow_nested.pass.cpp b/libcxx/test/std/language.support/support.exception/except.nested/rethrow_nested.pass.cpp --- a/libcxx/test/std/language.support/support.exception/except.nested/rethrow_nested.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/except.nested/rethrow_nested.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // class nested_exception; diff --git a/libcxx/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp b/libcxx/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp --- a/libcxx/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // class nested_exception; diff --git a/libcxx/test/std/language.support/support.exception/propagation/current_exception.pass.cpp b/libcxx/test/std/language.support/support.exception/propagation/current_exception.pass.cpp --- a/libcxx/test/std/language.support/support.exception/propagation/current_exception.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/propagation/current_exception.pass.cpp @@ -10,7 +10,7 @@ // which copy the exception each time the exception_ptr is copied. // XFAIL: LIBCXX-WINDOWS-FIXME -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // exception_ptr current_exception(); diff --git a/libcxx/test/std/language.support/support.exception/propagation/make_exception_ptr.pass.cpp b/libcxx/test/std/language.support/support.exception/propagation/make_exception_ptr.pass.cpp --- a/libcxx/test/std/language.support/support.exception/propagation/make_exception_ptr.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/propagation/make_exception_ptr.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // template exception_ptr make_exception_ptr(E e); diff --git a/libcxx/test/std/language.support/support.exception/propagation/rethrow_exception.pass.cpp b/libcxx/test/std/language.support/support.exception/propagation/rethrow_exception.pass.cpp --- a/libcxx/test/std/language.support/support.exception/propagation/rethrow_exception.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/propagation/rethrow_exception.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // void rethrow_exception [[noreturn]] (exception_ptr p); diff --git a/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exception.pass.cpp b/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exception.pass.cpp --- a/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exception.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exception.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // test uncaught_exception #include diff --git a/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp b/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp --- a/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp +++ b/libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp @@ -6,8 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions -// XFAIL: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // std::uncaught_exceptions() was introduced in the dylib on Mac OS 10.12 // XFAIL: with_system_cxx_lib=macosx10.11 diff --git a/libcxx/test/std/re/re.alg/re.alg.match/exponential.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.match/exponential.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.match/exponential.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.match/exponential.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: c++98, c++03 // template diff --git a/libcxx/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // template diff --git a/libcxx/test/std/re/re.alg/re.alg.search/exponential.pass.cpp b/libcxx/test/std/re/re.alg/re.alg.search/exponential.pass.cpp --- a/libcxx/test/std/re/re.alg/re.alg.search/exponential.pass.cpp +++ b/libcxx/test/std/re/re.alg/re.alg.search/exponential.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: c++98, c++03 // template diff --git a/libcxx/test/std/re/re.grammar/excessive_brace_count.pass.cpp b/libcxx/test/std/re/re.grammar/excessive_brace_count.pass.cpp --- a/libcxx/test/std/re/re.grammar/excessive_brace_count.pass.cpp +++ b/libcxx/test/std/re/re.grammar/excessive_brace_count.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: c++98, c++03 // the "n" in `a{n}` should be within the numeric limits. diff --git a/libcxx/test/std/re/re.grammar/excessive_brace_min_max.pass.cpp b/libcxx/test/std/re/re.grammar/excessive_brace_min_max.pass.cpp --- a/libcxx/test/std/re/re.grammar/excessive_brace_min_max.pass.cpp +++ b/libcxx/test/std/re/re.grammar/excessive_brace_min_max.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: c++98, c++03 // the "n" and "m" in `a{n,m}` should be within the numeric limits. diff --git a/libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp --- a/libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp +++ b/libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // template > class basic_regex; diff --git a/libcxx/test/std/re/re.regex/re.regex.construct/bad_ctype.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.construct/bad_ctype.pass.cpp --- a/libcxx/test/std/re/re.regex/re.regex.construct/bad_ctype.pass.cpp +++ b/libcxx/test/std/re/re.regex/re.regex.construct/bad_ctype.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // template > class basic_regex; diff --git a/libcxx/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp --- a/libcxx/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp +++ b/libcxx/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // template > class basic_regex; diff --git a/libcxx/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp --- a/libcxx/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp +++ b/libcxx/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // template > class basic_regex; diff --git a/libcxx/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp b/libcxx/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp --- a/libcxx/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp +++ b/libcxx/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // template > class basic_regex; diff --git a/libcxx/test/std/strings/basic.string/string.capacity/max_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.capacity/max_size.pass.cpp --- a/libcxx/test/std/strings/basic.string/string.capacity/max_size.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.capacity/max_size.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // size_type max_size() const; diff --git a/libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp b/libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp --- a/libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp +++ b/libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // XFAIL: with_system_cxx_lib=macosx10.11 // XFAIL: with_system_cxx_lib=macosx10.10 // XFAIL: with_system_cxx_lib=macosx10.9 diff --git a/libcxx/test/std/thread/futures/futures.promise/set_exception.pass.cpp b/libcxx/test/std/thread/futures/futures.promise/set_exception.pass.cpp --- a/libcxx/test/std/thread/futures/futures.promise/set_exception.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.promise/set_exception.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: c++98, c++03 diff --git a/libcxx/test/std/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp b/libcxx/test/std/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp --- a/libcxx/test/std/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: c++98, c++03 diff --git a/libcxx/test/std/thread/futures/futures.promise/set_rvalue.pass.cpp b/libcxx/test/std/thread/futures/futures.promise/set_rvalue.pass.cpp --- a/libcxx/test/std/thread/futures/futures.promise/set_rvalue.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.promise/set_rvalue.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03 -// UNSUPPORTED: libcpp-has-no-threads, libcpp-no-exceptions +// UNSUPPORTED: libcpp-has-no-threads, no-exceptions // diff --git a/libcxx/test/std/thread/futures/futures.promise/set_value_void.pass.cpp b/libcxx/test/std/thread/futures/futures.promise/set_value_void.pass.cpp --- a/libcxx/test/std/thread/futures/futures.promise/set_value_void.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.promise/set_value_void.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: c++98, c++03 diff --git a/libcxx/test/std/thread/futures/futures.shared_future/dtor.pass.cpp b/libcxx/test/std/thread/futures/futures.shared_future/dtor.pass.cpp --- a/libcxx/test/std/thread/futures/futures.shared_future/dtor.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.shared_future/dtor.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: c++98, c++03 diff --git a/libcxx/test/std/thread/futures/futures.unique_future/dtor.pass.cpp b/libcxx/test/std/thread/futures/futures.unique_future/dtor.pass.cpp --- a/libcxx/test/std/thread/futures/futures.unique_future/dtor.pass.cpp +++ b/libcxx/test/std/thread/futures/futures.unique_future/dtor.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// // -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: c++98, c++03 diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_terminates.sh.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_terminates.sh.cpp --- a/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_terminates.sh.cpp +++ b/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_terminates.sh.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: libcpp-has-no-threads // diff --git a/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp b/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp --- a/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp +++ b/libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp --- a/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp +++ b/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_any_cast && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_any_cast && !no-exceptions // diff --git a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp --- a/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp +++ b/libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // allocator: diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp --- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp +++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // template shared_ptr(nullptr_t, D d, A a); diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp --- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp +++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: sanitizer-new-delete // diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp --- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp +++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // // template shared_ptr(Y* p, D d, A a); diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp --- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp +++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: sanitizer-new-delete // diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp --- a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp +++ b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: sanitizer-new-delete // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp @@ -8,7 +8,7 @@ // // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp @@ -8,7 +8,7 @@ // // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp @@ -8,7 +8,7 @@ // // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp @@ -8,7 +8,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 // -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // constexpr T& optional::value() &&; diff --git a/libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp b/libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp --- a/libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp +++ b/libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions // // diff --git a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp @@ -8,7 +8,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // diff --git a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp --- a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp +++ b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: c++98, c++03, c++11, c++14 -// XFAIL: dylib-has-no-bad_variant_access && !libcpp-no-exceptions +// XFAIL: dylib-has-no-bad_variant_access && !no-exceptions // // template diff --git a/libcxx/test/support/test.support/test_macros_header_exceptions.pass.cpp b/libcxx/test/support/test.support/test_macros_header_exceptions.pass.cpp --- a/libcxx/test/support/test.support/test_macros_header_exceptions.pass.cpp +++ b/libcxx/test/support/test.support/test_macros_header_exceptions.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcpp-no-exceptions +// UNSUPPORTED: no-exceptions // "support/test_macros.hpp" diff --git a/libcxx/utils/libcxx/test/config.py b/libcxx/utils/libcxx/test/config.py --- a/libcxx/utils/libcxx/test/config.py +++ b/libcxx/utils/libcxx/test/config.py @@ -650,7 +650,7 @@ def configure_compile_flags_exceptions(self): enable_exceptions = self.get_lit_bool('enable_exceptions', True) if not enable_exceptions: - self.config.available_features.add('libcpp-no-exceptions') + self.config.available_features.add('no-exceptions') self.cxx.compile_flags += ['-fno-exceptions'] def configure_compile_flags_rtti(self): diff --git a/libcxxabi/test/backtrace_test.pass.cpp b/libcxxabi/test/backtrace_test.pass.cpp --- a/libcxxabi/test/backtrace_test.pass.cpp +++ b/libcxxabi/test/backtrace_test.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_array_01.pass.cpp b/libcxxabi/test/catch_array_01.pass.cpp --- a/libcxxabi/test/catch_array_01.pass.cpp +++ b/libcxxabi/test/catch_array_01.pass.cpp @@ -11,7 +11,7 @@ // GCC incorrectly allows array types to be caught by reference. // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69372 // XFAIL: gcc -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/catch_array_02.pass.cpp b/libcxxabi/test/catch_array_02.pass.cpp --- a/libcxxabi/test/catch_array_02.pass.cpp +++ b/libcxxabi/test/catch_array_02.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can you have a catch clause of array type that catches anything? -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/catch_class_01.pass.cpp b/libcxxabi/test/catch_class_01.pass.cpp --- a/libcxxabi/test/catch_class_01.pass.cpp +++ b/libcxxabi/test/catch_class_01.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_class_02.pass.cpp b/libcxxabi/test/catch_class_02.pass.cpp --- a/libcxxabi/test/catch_class_02.pass.cpp +++ b/libcxxabi/test/catch_class_02.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_class_03.pass.cpp b/libcxxabi/test/catch_class_03.pass.cpp --- a/libcxxabi/test/catch_class_03.pass.cpp +++ b/libcxxabi/test/catch_class_03.pass.cpp @@ -12,7 +12,7 @@ check against. */ -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_class_04.pass.cpp b/libcxxabi/test/catch_class_04.pass.cpp --- a/libcxxabi/test/catch_class_04.pass.cpp +++ b/libcxxabi/test/catch_class_04.pass.cpp @@ -12,7 +12,7 @@ check against. It also checks that virtual bases work properly */ -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_const_pointer_nullptr.pass.cpp b/libcxxabi/test/catch_const_pointer_nullptr.pass.cpp --- a/libcxxabi/test/catch_const_pointer_nullptr.pass.cpp +++ b/libcxxabi/test/catch_const_pointer_nullptr.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/catch_function_01.pass.cpp b/libcxxabi/test/catch_function_01.pass.cpp --- a/libcxxabi/test/catch_function_01.pass.cpp +++ b/libcxxabi/test/catch_function_01.pass.cpp @@ -11,7 +11,7 @@ // GCC incorrectly allows function pointer to be caught by reference. // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69372 // XFAIL: gcc -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/catch_function_02.pass.cpp b/libcxxabi/test/catch_function_02.pass.cpp --- a/libcxxabi/test/catch_function_02.pass.cpp +++ b/libcxxabi/test/catch_function_02.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can you have a catch clause of array type that catches anything? -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/catch_function_03.pass.cpp b/libcxxabi/test/catch_function_03.pass.cpp --- a/libcxxabi/test/catch_function_03.pass.cpp +++ b/libcxxabi/test/catch_function_03.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // Can a noexcept function pointer be caught by a non-noexcept catch clause? -// UNSUPPORTED: libcxxabi-no-exceptions, libcxxabi-no-noexcept-function-type +// UNSUPPORTED: no-exceptions, libcxxabi-no-noexcept-function-type #include diff --git a/libcxxabi/test/catch_in_noexcept.pass.cpp b/libcxxabi/test/catch_in_noexcept.pass.cpp --- a/libcxxabi/test/catch_in_noexcept.pass.cpp +++ b/libcxxabi/test/catch_in_noexcept.pass.cpp @@ -6,7 +6,8 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, libcxxabi-no-exceptions +// UNSUPPORTED: c++98, c++03 +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_member_data_pointer_01.pass.cpp b/libcxxabi/test/catch_member_data_pointer_01.pass.cpp --- a/libcxxabi/test/catch_member_data_pointer_01.pass.cpp +++ b/libcxxabi/test/catch_member_data_pointer_01.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/catch_member_function_pointer_01.pass.cpp b/libcxxabi/test/catch_member_function_pointer_01.pass.cpp --- a/libcxxabi/test/catch_member_function_pointer_01.pass.cpp +++ b/libcxxabi/test/catch_member_function_pointer_01.pass.cpp @@ -9,7 +9,7 @@ // GCC incorrectly allows PMF type "void (T::*)()" to be caught as "void (T::*)() const" // See https://gcc.gnu.org/bugzilla/show_bug.cgi?id=69375 // XFAIL: gcc -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include struct A diff --git a/libcxxabi/test/catch_member_function_pointer_02.pass.cpp b/libcxxabi/test/catch_member_function_pointer_02.pass.cpp --- a/libcxxabi/test/catch_member_function_pointer_02.pass.cpp +++ b/libcxxabi/test/catch_member_function_pointer_02.pass.cpp @@ -8,7 +8,7 @@ // Can a noexcept member function pointer be caught by a non-noexcept catch // clause? -// UNSUPPORTED: libcxxabi-no-exceptions, libcxxabi-no-noexcept-function-type +// UNSUPPORTED: no-exceptions, libcxxabi-no-noexcept-function-type // GCC 7 and 8 support noexcept function types but this test still fails. // This is likely a bug in their implementation. Investigation needed. diff --git a/libcxxabi/test/catch_member_pointer_nullptr.pass.cpp b/libcxxabi/test/catch_member_pointer_nullptr.pass.cpp --- a/libcxxabi/test/catch_member_pointer_nullptr.pass.cpp +++ b/libcxxabi/test/catch_member_pointer_nullptr.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/catch_multi_level_pointer.pass.cpp b/libcxxabi/test/catch_multi_level_pointer.pass.cpp --- a/libcxxabi/test/catch_multi_level_pointer.pass.cpp +++ b/libcxxabi/test/catch_multi_level_pointer.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_pointer_nullptr.pass.cpp b/libcxxabi/test/catch_pointer_nullptr.pass.cpp --- a/libcxxabi/test/catch_pointer_nullptr.pass.cpp +++ b/libcxxabi/test/catch_pointer_nullptr.pass.cpp @@ -6,7 +6,8 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, libcxxabi-no-exceptions +// UNSUPPORTED: c++98, c++03 +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_pointer_reference.pass.cpp b/libcxxabi/test/catch_pointer_reference.pass.cpp --- a/libcxxabi/test/catch_pointer_reference.pass.cpp +++ b/libcxxabi/test/catch_pointer_reference.pass.cpp @@ -24,7 +24,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_ptr.pass.cpp b/libcxxabi/test/catch_ptr.pass.cpp --- a/libcxxabi/test/catch_ptr.pass.cpp +++ b/libcxxabi/test/catch_ptr.pass.cpp @@ -12,7 +12,7 @@ check against. It also checks that virtual bases work properly */ -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/catch_ptr_02.pass.cpp b/libcxxabi/test/catch_ptr_02.pass.cpp --- a/libcxxabi/test/catch_ptr_02.pass.cpp +++ b/libcxxabi/test/catch_ptr_02.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/catch_reference_nullptr.pass.cpp b/libcxxabi/test/catch_reference_nullptr.pass.cpp --- a/libcxxabi/test/catch_reference_nullptr.pass.cpp +++ b/libcxxabi/test/catch_reference_nullptr.pass.cpp @@ -6,7 +6,8 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: c++98, c++03, libcxxabi-no-exceptions +// UNSUPPORTED: c++98, c++03, +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp b/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp --- a/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp +++ b/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include "cxxabi.h" #include diff --git a/libcxxabi/test/exception_object_alignment.2.pass.cpp b/libcxxabi/test/exception_object_alignment.2.pass.cpp --- a/libcxxabi/test/exception_object_alignment.2.pass.cpp +++ b/libcxxabi/test/exception_object_alignment.2.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // This test checks that the compiler does not make incorrect assumptions // about the alignment of the exception (only in that specific case, of diff --git a/libcxxabi/test/exception_object_alignment.pass.cpp b/libcxxabi/test/exception_object_alignment.pass.cpp --- a/libcxxabi/test/exception_object_alignment.pass.cpp +++ b/libcxxabi/test/exception_object_alignment.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // Check that the pointer __cxa_allocate_exception returns is aligned to the // default alignment for the target architecture. diff --git a/libcxxabi/test/guard_threaded_test.pass.cpp b/libcxxabi/test/guard_threaded_test.pass.cpp --- a/libcxxabi/test/guard_threaded_test.pass.cpp +++ b/libcxxabi/test/guard_threaded_test.pass.cpp @@ -7,7 +7,8 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03 -// UNSUPPORTED: libcxxabi-no-threads, libcxxabi-no-exceptions +// UNSUPPORTED: libcxxabi-no-threads +// UNSUPPORTED: no-exceptions #define TESTING_CXA_GUARD #include "../src/cxa_guard_impl.h" diff --git a/libcxxabi/test/incomplete_type.sh.cpp b/libcxxabi/test/incomplete_type.sh.cpp --- a/libcxxabi/test/incomplete_type.sh.cpp +++ b/libcxxabi/test/incomplete_type.sh.cpp @@ -13,7 +13,7 @@ // incomplete flags set, equality can be tested by comparing the type_info // addresses. -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // NOTE: Link libc++abi explicitly and before libc++ so that libc++ doesn't drag // in the system libc++abi installation on OS X. (DYLD_LIBRARY_PATH is ignored diff --git a/libcxxabi/test/inherited_exception.pass.cpp b/libcxxabi/test/inherited_exception.pass.cpp --- a/libcxxabi/test/inherited_exception.pass.cpp +++ b/libcxxabi/test/inherited_exception.pass.cpp @@ -24,7 +24,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // Clang emits warnings about exceptions of type 'Child' being caught by // an earlier handler of type 'Base'. Congrats clang, you've just diff --git a/libcxxabi/test/libcxxabi/test/config.py b/libcxxabi/test/libcxxabi/test/config.py --- a/libcxxabi/test/libcxxabi/test/config.py +++ b/libcxxabi/test/libcxxabi/test/config.py @@ -39,7 +39,7 @@ def configure_features(self): super(Configuration, self).configure_features() if not self.get_lit_bool('enable_exceptions', True): - self.config.available_features.add('libcxxabi-no-exceptions') + self.config.available_features.add('no-exceptions') if not self.has_cpp_feature('noexcept_function_type', 201510): self.config.available_features.add('libcxxabi-no-noexcept-function-type') if not self.get_lit_bool('llvm_unwinder', False): diff --git a/libcxxabi/test/native/arm-linux-eabi/ttype-encoding-00.pass.sh.s b/libcxxabi/test/native/arm-linux-eabi/ttype-encoding-00.pass.sh.s --- a/libcxxabi/test/native/arm-linux-eabi/ttype-encoding-00.pass.sh.s +++ b/libcxxabi/test/native/arm-linux-eabi/ttype-encoding-00.pass.sh.s @@ -1,6 +1,6 @@ @ RUN: %{cxx} %{flags} %{link_flags} %s -o %t.exe @ RUN: %t.exe -@ UNSUPPORTED: libcxxabi-no-exceptions +@ UNSUPPORTED: no-exceptions @ PURPOSE: Check that 0x00 is a valid value for ttype encoding. LLVM and @ GCC 4.6 are generating 0x00 as ttype encoding. libc++abi should provide diff --git a/libcxxabi/test/native/arm-linux-eabi/ttype-encoding-90.pass.sh.s b/libcxxabi/test/native/arm-linux-eabi/ttype-encoding-90.pass.sh.s --- a/libcxxabi/test/native/arm-linux-eabi/ttype-encoding-90.pass.sh.s +++ b/libcxxabi/test/native/arm-linux-eabi/ttype-encoding-90.pass.sh.s @@ -1,6 +1,6 @@ @ RUN: %{cxx} %{flags} %{link_flags} %s -o %t.exe @ RUN: %t.exe -@ UNSUPPORTED: libcxxabi-no-exceptions +@ UNSUPPORTED: no-exceptions @ PURPOSE: Check that 0x90 is a valid value for ttype encoding. diff --git a/libcxxabi/test/noexception1.pass.cpp b/libcxxabi/test/noexception1.pass.cpp --- a/libcxxabi/test/noexception1.pass.cpp +++ b/libcxxabi/test/noexception1.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03 -// REQUIRES: libcxxabi-no-exceptions +// REQUIRES: no-exceptions #include #include diff --git a/libcxxabi/test/noexception2.pass.cpp b/libcxxabi/test/noexception2.pass.cpp --- a/libcxxabi/test/noexception2.pass.cpp +++ b/libcxxabi/test/noexception2.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03 -// REQUIRES: libcxxabi-no-exceptions +// REQUIRES: no-exceptions #include #include diff --git a/libcxxabi/test/noexception3.pass.cpp b/libcxxabi/test/noexception3.pass.cpp --- a/libcxxabi/test/noexception3.pass.cpp +++ b/libcxxabi/test/noexception3.pass.cpp @@ -7,7 +7,7 @@ //===----------------------------------------------------------------------===// // UNSUPPORTED: c++98, c++03 -// REQUIRES: libcxxabi-no-exceptions +// REQUIRES: no-exceptions #include #include diff --git a/libcxxabi/test/noexception4.pass.cpp b/libcxxabi/test/noexception4.pass.cpp --- a/libcxxabi/test/noexception4.pass.cpp +++ b/libcxxabi/test/noexception4.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// REQUIRES: libcxxabi-no-exceptions +// REQUIRES: no-exceptions #include #include diff --git a/libcxxabi/test/test_aux_runtime.pass.cpp b/libcxxabi/test/test_aux_runtime.pass.cpp --- a/libcxxabi/test/test_aux_runtime.pass.cpp +++ b/libcxxabi/test/test_aux_runtime.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp b/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp --- a/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp +++ b/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/test_exception_address_alignment.pass.cpp b/libcxxabi/test/test_exception_address_alignment.pass.cpp --- a/libcxxabi/test/test_exception_address_alignment.pass.cpp +++ b/libcxxabi/test/test_exception_address_alignment.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // UNSUPPORTED: c++98, c++03 // The system unwind.h on OS X provides an incorrectly aligned _Unwind_Exception diff --git a/libcxxabi/test/test_vector2.pass.cpp b/libcxxabi/test/test_vector2.pass.cpp --- a/libcxxabi/test/test_vector2.pass.cpp +++ b/libcxxabi/test/test_vector2.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include "cxxabi.h" diff --git a/libcxxabi/test/test_vector3.pass.cpp b/libcxxabi/test/test_vector3.pass.cpp --- a/libcxxabi/test/test_vector3.pass.cpp +++ b/libcxxabi/test/test_vector3.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include "cxxabi.h" diff --git a/libcxxabi/test/uncaught_exception.pass.cpp b/libcxxabi/test/uncaught_exception.pass.cpp --- a/libcxxabi/test/uncaught_exception.pass.cpp +++ b/libcxxabi/test/uncaught_exception.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // This tests that libc++abi still provides __cxa_uncaught_exception() for // ABI compatibility, even though the Standard doesn't require it to. diff --git a/libcxxabi/test/uncaught_exceptions.pass.cpp b/libcxxabi/test/uncaught_exceptions.pass.cpp --- a/libcxxabi/test/uncaught_exceptions.pass.cpp +++ b/libcxxabi/test/uncaught_exceptions.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libcxxabi/test/unwind_01.pass.cpp b/libcxxabi/test/unwind_01.pass.cpp --- a/libcxxabi/test/unwind_01.pass.cpp +++ b/libcxxabi/test/unwind_01.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include diff --git a/libcxxabi/test/unwind_02.pass.cpp b/libcxxabi/test/unwind_02.pass.cpp --- a/libcxxabi/test/unwind_02.pass.cpp +++ b/libcxxabi/test/unwind_02.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // REQUIRES: c++98 || c++03 || c++11 || c++14 #include diff --git a/libcxxabi/test/unwind_03.pass.cpp b/libcxxabi/test/unwind_03.pass.cpp --- a/libcxxabi/test/unwind_03.pass.cpp +++ b/libcxxabi/test/unwind_03.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // REQUIRES: c++98 || c++03 || c++11 || c++14 #include diff --git a/libcxxabi/test/unwind_04.pass.cpp b/libcxxabi/test/unwind_04.pass.cpp --- a/libcxxabi/test/unwind_04.pass.cpp +++ b/libcxxabi/test/unwind_04.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // REQUIRES: c++98 || c++03 || c++11 || c++14 #include diff --git a/libcxxabi/test/unwind_05.pass.cpp b/libcxxabi/test/unwind_05.pass.cpp --- a/libcxxabi/test/unwind_05.pass.cpp +++ b/libcxxabi/test/unwind_05.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions // REQUIRES: c++98 || c++03 || c++11 || c++14 #include diff --git a/libcxxabi/test/unwind_06.pass.cpp b/libcxxabi/test/unwind_06.pass.cpp --- a/libcxxabi/test/unwind_06.pass.cpp +++ b/libcxxabi/test/unwind_06.pass.cpp @@ -6,7 +6,7 @@ // //===----------------------------------------------------------------------===// -// UNSUPPORTED: libcxxabi-no-exceptions +// UNSUPPORTED: no-exceptions #include #include diff --git a/libunwind/test/libunwind/test/config.py b/libunwind/test/libunwind/test/config.py --- a/libunwind/test/libunwind/test/config.py +++ b/libunwind/test/libunwind/test/config.py @@ -36,7 +36,7 @@ def configure_features(self): super(Configuration, self).configure_features() if not self.get_lit_bool('enable_exceptions', True): - self.config.available_features.add('libcxxabi-no-exceptions') + self.config.available_features.add('no-exceptions') if self.get_lit_bool('arm_ehabi', False): self.config.available_features.add('libunwind-arm-ehabi')