[libc++/abi/unwind] Rename Lit features for no exceptions to 'no-exceptions'

Instead of having different names for the same Lit feature accross code
bases, use the same name everywhere. This NFC commit is in preparation
for a refactor where all three projects will be using the same Lit
feature detection logic, and hence it won't be convenient to use
different names for the feature.

Differential Revision: https://reviews.llvm.org/D78370

libcxx/test/libcxx/algorithms/debug_less.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 
 // <algorithm>
 

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 <csignal>
 #include <cstdlib>

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 <csignal>
 #include <cstdlib>

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 <vector>

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 <csignal>

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 <csignal>

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 <csignal>
 #include <cstdlib>

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.

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.

libcxx/test/libcxx/localization/locales/use_facet.abort.pass.cpp

@@ -10,7 +10,7 @@
 
 // template <class Facet> 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.

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;

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
 // <deque>
 
 // void push_back(const value_type& x);

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
 // <deque>
 
 // void push_front(const value_type& x);

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
 // <forward_list>
 
 // void push_front(const value_type& x);

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
 // <list>
 
 // void push_back(const value_type& x);

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
 // <list>
 
 // void push_front(const value_type& x);

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

libcxx/test/std/language.support/support.exception/except.nested/rethrow_nested.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <exception>
 
 // class nested_exception;

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
 // <exception>
 
 // class nested_exception;

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>
 
 // exception_ptr current_exception();

libcxx/test/std/language.support/support.exception/propagation/make_exception_ptr.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <exception>
 
 // template<class E> exception_ptr make_exception_ptr(E e);

libcxx/test/std/language.support/support.exception/propagation/rethrow_exception.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <exception>
 
 // void rethrow_exception [[noreturn]] (exception_ptr p);

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 <exception>

libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp

@@ -6,8 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
-// XFAIL: libcpp-no-exceptions
 
 // std::uncaught_exceptions() was introduced in the dylib on Mac OS 10.12
 // XFAIL: with_system_cxx_lib=macosx10.11

libcxx/test/std/re/re.alg/re.alg.match/exponential.pass.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // <regex>
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // UNSUPPORTED: c++98, c++03
 
 // template <class BidirectionalIterator, class Allocator, class charT, class traits>

libcxx/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // <regex>
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 
 // template <class OutputIterator, class BidirectionalIterator,
 //           class traits, class charT, class ST, class SA>

libcxx/test/std/re/re.alg/re.alg.search/exponential.pass.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // <regex>
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // UNSUPPORTED: c++98, c++03
 
 // template <class BidirectionalIterator, class Allocator, class charT, class traits>

libcxx/test/std/re/re.grammar/excessive_brace_count.pass.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // <regex>
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // UNSUPPORTED: c++98, c++03
 
 // the "n" in `a{n}` should be within the numeric limits.

libcxx/test/std/re/re.grammar/excessive_brace_min_max.pass.cpp

@@ -7,7 +7,7 @@
 //===----------------------------------------------------------------------===//
 
 // <regex>
-// 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.

libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <regex>
 
 // template <class charT, class traits = regex_traits<charT>> class basic_regex;

libcxx/test/std/re/re.regex/re.regex.construct/bad_ctype.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <regex>
 
 // template <class charT, class traits = regex_traits<charT>> class basic_regex;

libcxx/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <regex>
 
 // template <class charT, class traits = regex_traits<charT>> class basic_regex;

libcxx/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <regex>
 
 // template <class charT, class traits = regex_traits<charT>> class basic_regex;

libcxx/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <regex>
 
 // template <class charT, class traits = regex_traits<charT>> class basic_regex;

libcxx/test/std/strings/basic.string/string.capacity/max_size.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <string>
 
 // size_type max_size() const;

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

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
 

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
 

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
 
 // <future>
 

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
 

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
 

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
 

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
 
 // <condition_variable>

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

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
 
 // <any>
 

libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
 // <memory>
 
 // allocator:

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
 // <memory>
 
 // template<class D, class A> shared_ptr(nullptr_t, D d, A a);

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
 
 // <memory>

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
 // <memory>
 
 // template<class Y, class D, class A> shared_ptr(Y* p, D d, A a);

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
 
 // <memory>

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
 
 // <memory>

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
 
 // <optional>
 

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
 
 // <optional>
 

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
 
 // <optional>
 

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
 
 // <optional>
 

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
 
 // <optional>
 

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
 
 // <optional>
 

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
 
 // <optional>
 

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
 // <optional>
 
-// XFAIL: dylib-has-no-bad_optional_access && !libcpp-no-exceptions
+// XFAIL: dylib-has-no-bad_optional_access && !no-exceptions
 
 // constexpr T& optional<T>::value() &&;
 

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
 
 // <optional>
 //

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 
 // <variant>

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 

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
 
 // <variant>
 // template <class Visitor, class... Variants>

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"
 

libcxx/utils/libcxx/test/config.py

@@ -650,7 +650,7 @@ class Configuration(object):
     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):

libcxxabi/test/backtrace_test.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcxxabi-no-exceptions
+// UNSUPPORTED: no-exceptions
 
 #include <assert.h>
 #include <stddef.h>

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 <cassert>
 

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 <cassert>
 

libcxxabi/test/catch_class_01.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcxxabi-no-exceptions
+// UNSUPPORTED: no-exceptions
 
 #include <exception>
 #include <stdlib.h>

libcxxabi/test/catch_class_02.pass.cpp

@@ -6,7 +6,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-// UNSUPPORTED: libcxxabi-no-exceptions
+// UNSUPPORTED: no-exceptions
 
 #include <exception>
 #include <stdlib.h>

libcxxabi/test/catch_class_03.pass.cpp

@@ -12,7 +12,7 @@
     check against.
 */
 
-// UNSUPPORTED: libcxxabi-no-exceptions
+// UNSUPPORTED: no-exceptions
 
 #include <exception>
 #include <stdlib.h>

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 <exception>
 #include <stdlib.h>