[libcxx-commits] [libcxxabi] 8c61114 - [libc++/abi/unwind] Rename Lit features for no exceptions to 'no-exceptions'
Louis Dionne via libcxx-commits
libcxx-commits at lists.llvm.org
Wed Apr 22 05:25:35 PDT 2020
Author: Louis Dionne
Date: 2020-04-22T08:25:27-04:00
New Revision: 8c61114c53dcd6139a4a750925b91ed9bcf4178c
URL: https://github.com/llvm/llvm-project/commit/8c61114c53dcd6139a4a750925b91ed9bcf4178c
DIFF: https://github.com/llvm/llvm-project/commit/8c61114c53dcd6139a4a750925b91ed9bcf4178c.diff
LOG: [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
Added:
Modified:
libcxx/test/libcxx/algorithms/debug_less.pass.cpp
libcxx/test/libcxx/containers/associative/map/at.abort.pass.cpp
libcxx/test/libcxx/containers/associative/map/at.const.abort.pass.cpp
libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp
libcxx/test/libcxx/containers/unord/unord.map/at.abort.pass.cpp
libcxx/test/libcxx/containers/unord/unord.map/at.const.abort.pass.cpp
libcxx/test/libcxx/input.output/iostreams.base/ios/iostate.flags/clear.abort.pass.cpp
libcxx/test/libcxx/localization/locales/locale.abort.pass.cpp
libcxx/test/libcxx/localization/locales/locale.category.abort.pass.cpp
libcxx/test/libcxx/localization/locales/use_facet.abort.pass.cpp
libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp
libcxx/test/std/containers/sequences/deque/deque.modifiers/push_back_exception_safety.pass.cpp
libcxx/test/std/containers/sequences/deque/deque.modifiers/push_front_exception_safety.pass.cpp
libcxx/test/std/containers/sequences/forwardlist/forwardlist.modifiers/push_front_exception_safety.pass.cpp
libcxx/test/std/containers/sequences/list/list.modifiers/push_back_exception_safety.pass.cpp
libcxx/test/std/containers/sequences/list/list.modifiers/push_front_exception_safety.pass.cpp
libcxx/test/std/language.support/support.exception/except.nested/rethrow_if_nested.pass.cpp
libcxx/test/std/language.support/support.exception/except.nested/rethrow_nested.pass.cpp
libcxx/test/std/language.support/support.exception/except.nested/throw_with_nested.pass.cpp
libcxx/test/std/language.support/support.exception/propagation/current_exception.pass.cpp
libcxx/test/std/language.support/support.exception/propagation/make_exception_ptr.pass.cpp
libcxx/test/std/language.support/support.exception/propagation/rethrow_exception.pass.cpp
libcxx/test/std/language.support/support.exception/uncaught/uncaught_exception.pass.cpp
libcxx/test/std/language.support/support.exception/uncaught/uncaught_exceptions.pass.cpp
libcxx/test/std/re/re.alg/re.alg.match/exponential.pass.cpp
libcxx/test/std/re/re.alg/re.alg.replace/exponential.pass.cpp
libcxx/test/std/re/re.alg/re.alg.search/exponential.pass.cpp
libcxx/test/std/re/re.grammar/excessive_brace_count.pass.cpp
libcxx/test/std/re/re.grammar/excessive_brace_min_max.pass.cpp
libcxx/test/std/re/re.regex/re.regex.construct/bad_backref.pass.cpp
libcxx/test/std/re/re.regex/re.regex.construct/bad_ctype.pass.cpp
libcxx/test/std/re/re.regex/re.regex.construct/bad_escape.pass.cpp
libcxx/test/std/re/re.regex/re.regex.construct/bad_range.pass.cpp
libcxx/test/std/re/re.regex/re.regex.construct/bad_repeat.pass.cpp
libcxx/test/std/strings/basic.string/string.capacity/max_size.pass.cpp
libcxx/test/std/strings/basic.string/string.capacity/over_max_size.pass.cpp
libcxx/test/std/thread/futures/futures.promise/set_exception.pass.cpp
libcxx/test/std/thread/futures/futures.promise/set_exception_at_thread_exit.pass.cpp
libcxx/test/std/thread/futures/futures.promise/set_rvalue.pass.cpp
libcxx/test/std/thread/futures/futures.promise/set_value_void.pass.cpp
libcxx/test/std/thread/futures/futures.shared_future/dtor.pass.cpp
libcxx/test/std/thread/futures/futures.unique_future/dtor.pass.cpp
libcxx/test/std/thread/thread.condition/thread.condition.condvarany/wait_terminates.sh.cpp
libcxx/test/std/utilities/any/any.class/any.assign/copy.pass.cpp
libcxx/test/std/utilities/any/any.class/any.assign/move.pass.cpp
libcxx/test/std/utilities/any/any.class/any.assign/value.pass.cpp
libcxx/test/std/utilities/any/any.class/any.cons/copy.pass.cpp
libcxx/test/std/utilities/any/any.class/any.cons/in_place_type.pass.cpp
libcxx/test/std/utilities/any/any.class/any.cons/move.pass.cpp
libcxx/test/std/utilities/any/any.class/any.cons/value.pass.cpp
libcxx/test/std/utilities/any/any.class/any.modifiers/emplace.pass.cpp
libcxx/test/std/utilities/any/any.class/any.modifiers/reset.pass.cpp
libcxx/test/std/utilities/any/any.class/any.modifiers/swap.pass.cpp
libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_pointer.pass.cpp
libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_reference.pass.cpp
libcxx/test/std/utilities/any/any.nonmembers/make_any.pass.cpp
libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp
libcxx/test/std/utilities/memory/default.allocator/allocator.members/allocate.size.pass.cpp
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_allocator_throw.pass.cpp
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/nullptr_t_deleter_throw.pass.cpp
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_allocator_throw.pass.cpp
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_deleter_throw.pass.cpp
libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/pointer_throw.pass.cpp
libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/U.pass.cpp
libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/const_T.pass.cpp
libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/move.pass.cpp
libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/rvalue_T.pass.cpp
libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value.pass.cpp
libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.pass.cpp
libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const_rvalue.pass.cpp
libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_rvalue.pass.cpp
libcxx/test/std/utilities/optional/optional.specalg/make_optional.pass.cpp
libcxx/test/std/utilities/variant/variant.get/get_index.pass.cpp
libcxx/test/std/utilities/variant/variant.get/get_type.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.assign/T.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.assign/move.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.ctor/T.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.ctor/copy.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.ctor/default.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_args.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_index_init_list_args.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_args.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.ctor/in_place_type_init_list_args.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.ctor/move.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_args.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_index_init_list_args.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_args.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.mod/emplace_type_init_list_args.pass.cpp
libcxx/test/std/utilities/variant/variant.variant/variant.swap/swap.pass.cpp
libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
libcxx/test/support/test.support/test_macros_header_exceptions.pass.cpp
libcxx/utils/libcxx/test/config.py
libcxxabi/test/backtrace_test.pass.cpp
libcxxabi/test/catch_array_01.pass.cpp
libcxxabi/test/catch_array_02.pass.cpp
libcxxabi/test/catch_class_01.pass.cpp
libcxxabi/test/catch_class_02.pass.cpp
libcxxabi/test/catch_class_03.pass.cpp
libcxxabi/test/catch_class_04.pass.cpp
libcxxabi/test/catch_const_pointer_nullptr.pass.cpp
libcxxabi/test/catch_function_01.pass.cpp
libcxxabi/test/catch_function_02.pass.cpp
libcxxabi/test/catch_function_03.pass.cpp
libcxxabi/test/catch_in_noexcept.pass.cpp
libcxxabi/test/catch_member_data_pointer_01.pass.cpp
libcxxabi/test/catch_member_function_pointer_01.pass.cpp
libcxxabi/test/catch_member_function_pointer_02.pass.cpp
libcxxabi/test/catch_member_pointer_nullptr.pass.cpp
libcxxabi/test/catch_multi_level_pointer.pass.cpp
libcxxabi/test/catch_pointer_nullptr.pass.cpp
libcxxabi/test/catch_pointer_reference.pass.cpp
libcxxabi/test/catch_ptr.pass.cpp
libcxxabi/test/catch_ptr_02.pass.cpp
libcxxabi/test/catch_reference_nullptr.pass.cpp
libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp
libcxxabi/test/exception_object_alignment.2.pass.cpp
libcxxabi/test/exception_object_alignment.pass.cpp
libcxxabi/test/guard_threaded_test.pass.cpp
libcxxabi/test/incomplete_type.sh.cpp
libcxxabi/test/inherited_exception.pass.cpp
libcxxabi/test/libcxxabi/test/config.py
libcxxabi/test/native/arm-linux-eabi/ttype-encoding-00.pass.sh.s
libcxxabi/test/native/arm-linux-eabi/ttype-encoding-90.pass.sh.s
libcxxabi/test/noexception1.pass.cpp
libcxxabi/test/noexception2.pass.cpp
libcxxabi/test/noexception3.pass.cpp
libcxxabi/test/noexception4.pass.cpp
libcxxabi/test/test_aux_runtime.pass.cpp
libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp
libcxxabi/test/test_exception_address_alignment.pass.cpp
libcxxabi/test/test_vector2.pass.cpp
libcxxabi/test/test_vector3.pass.cpp
libcxxabi/test/uncaught_exception.pass.cpp
libcxxabi/test/uncaught_exceptions.pass.cpp
libcxxabi/test/unwind_01.pass.cpp
libcxxabi/test/unwind_02.pass.cpp
libcxxabi/test/unwind_03.pass.cpp
libcxxabi/test/unwind_04.pass.cpp
libcxxabi/test/unwind_05.pass.cpp
libcxxabi/test/unwind_06.pass.cpp
libunwind/test/libunwind/test/config.py
Removed:
################################################################################
diff --git a/libcxx/test/libcxx/algorithms/debug_less.pass.cpp b/libcxx/test/libcxx/algorithms/debug_less.pass.cpp
index 6a05b8db67a8..6dd56955001d 100644
--- 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
// <algorithm>
diff --git a/libcxx/test/libcxx/containers/associative/map/at.abort.pass.cpp b/libcxx/test/libcxx/containers/associative/map/at.abort.pass.cpp
index d4edbd752d20..36aa644abb59 100644
--- 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 <csignal>
#include <cstdlib>
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
index 6860e3431498..f3dcca888f2b 100644
--- 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 <csignal>
#include <cstdlib>
diff --git a/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp b/libcxx/test/libcxx/containers/sequences/vector/asan_throw.pass.cpp
index 235a3ffae14e..71d4f33366f3 100644
--- 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 <vector>
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
index 364d24e17295..fe2fb8cdffde 100644
--- 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 <csignal>
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
index cc4cf2b37dc9..649ef7b98983 100644
--- 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 <csignal>
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
index a302398feb7f..8f0f5a6d78b1 100644
--- 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 <csignal>
#include <cstdlib>
diff --git a/libcxx/test/libcxx/localization/locales/locale.abort.pass.cpp b/libcxx/test/libcxx/localization/locales/locale.abort.pass.cpp
index cff67c0573ae..9a47eb8f13c6 100644
--- 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
index 60e5696dd546..9b321e6b1fd3 100644
--- 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
index 0145e005ba04..9b4755a819cb 100644
--- 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 <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.
diff --git a/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp b/libcxx/test/libcxx/strings/iterators.exceptions.pass.cpp
index 471e6bea560d..d281cb206554 100644
--- 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
index 376f042e53b7..b24fd0753770 100644
--- 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
// <deque>
// 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
index c43839780d2b..990f41f48726 100644
--- 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
// <deque>
// 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
index a1590abfea7b..1154447b04a9 100644
--- 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
// <forward_list>
// 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
index e4595ef25127..8faf97a7dc4f 100644
--- 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
// <list>
// 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
index ebc9ac7f44be..aadeaaf13512 100644
--- 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
// <list>
// 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
index 01ef7ade7c2b..6c1ecf3a1fe9 100644
--- 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
index a3bf862f3f1c..1d9ff1e96c3a 100644
--- 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
// <exception>
// 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
index b63053c3304f..6a17d7a0ac0d 100644
--- 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
// <exception>
// 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
index de924016c4fc..8bad7f16f783 100644
--- 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>
// 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
index 8d7f6d0ead58..e97b15adc50a 100644
--- 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
// <exception>
// template<class E> 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
index 49c30c3be10d..d109f98fbc21 100644
--- 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
// <exception>
// 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
index 004d525521d0..e368ce177b31 100644
--- 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 <exception>
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
index 6726706923ec..b7b5be774746 100644
--- 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
index a1ba80f26811..738bd25adc80 100644
--- 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 @@
//===----------------------------------------------------------------------===//
// <regex>
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
// UNSUPPORTED: c++98, c++03
// template <class BidirectionalIterator, class Allocator, class charT, class traits>
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
index 868c3d8350b3..316759fd895d 100644
--- 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 @@
//===----------------------------------------------------------------------===//
// <regex>
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
// template <class OutputIterator, class BidirectionalIterator,
// class traits, class charT, class ST, class SA>
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
index a9eb2b2b94e6..6825cb74806a 100644
--- 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 @@
//===----------------------------------------------------------------------===//
// <regex>
-// UNSUPPORTED: libcpp-no-exceptions
+// UNSUPPORTED: no-exceptions
// UNSUPPORTED: c++98, c++03
// template <class BidirectionalIterator, class Allocator, class charT, class traits>
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
index a5f28d2eec0d..8b6f7add4993 100644
--- 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 @@
//===----------------------------------------------------------------------===//
// <regex>
-// 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
index 09bedc5bd8e2..3954b256168e 100644
--- 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 @@
//===----------------------------------------------------------------------===//
// <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.
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
index 08a14442e4e3..1021ebf84f4a 100644
--- 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
// <regex>
// template <class charT, class traits = regex_traits<charT>> 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
index 5752d5cd681c..31f6e9a711ba 100644
--- 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
// <regex>
// template <class charT, class traits = regex_traits<charT>> 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
index 041d55bdf88d..abb854e44f69 100644
--- 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
// <regex>
// template <class charT, class traits = regex_traits<charT>> 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
index 590c10f94dff..023bc0ee79f4 100644
--- 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
// <regex>
// template <class charT, class traits = regex_traits<charT>> 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
index 1af8b5ba651d..b600ef70e176 100644
--- 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
// <regex>
// template <class charT, class traits = regex_traits<charT>> 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
index 32f0be2775a1..d5bc1d50ca54 100644
--- 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
// <string>
// 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
index df7c8731f249..9271f3ce283e 100644
--- 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
index b634858d22db..bfd137416dc8 100644
--- 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
index dede79674031..4cd6fcc2022e 100644
--- 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
index e5f7d53c8b24..d35b8613a622 100644
--- 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
// <future>
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
index 16f1022b10c4..d3904f43cae9 100644
--- 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
index 6eef6150403e..f06c937be366 100644
--- 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
index 2f09ffa02da5..0dd23c18c826 100644
--- 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
index 0ee02919f221..2d6e962f6dce 100644
--- 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
// <condition_variable>
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
index 7f44afec7fde..d56346e6d6e2 100644
--- 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
// <any>
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
index 165cc0096034..db000ae4a689 100644
--- 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
// <any>
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
index 5ac9b7985d5c..01bb7ecd2f94 100644
--- 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
// <any>
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
index de2990189285..cfe4fc2ce4e9 100644
--- 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
// <any>
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
index 329322d2d676..231f3d656403 100644
--- 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
// <any>
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
index ac88e0f78df7..c6b520e9318d 100644
--- 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
// <any>
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
index ecd3bd7616bd..4f46b0bec540 100644
--- 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
// <any>
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
index e2b232b08191..c7a75a059c95 100644
--- 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
// <any>
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
index fd4dee2f2f33..b8ea8e89908f 100644
--- 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
// <any>
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
index 9c85d3f6cf79..5889249fa40b 100644
--- 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
// <any>
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
index d2cf58696f88..c507de3a32a4 100644
--- 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
// <any>
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
index faaca948a612..8e5afaabea6d 100644
--- 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
// <any>
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
index 5e319efdab08..c0de5f1fa49f 100644
--- 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
// <any>
diff --git a/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp b/libcxx/test/std/utilities/any/any.nonmembers/swap.pass.cpp
index 1e982235f4a2..5d3e8a457657 100644
--- 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
// <any>
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
index 7eb2a8a9bb61..48419174b661 100644
--- 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
// <memory>
// 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
index 51eccc59b369..ce9c3e5875eb 100644
--- 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
// <memory>
// template<class D, class A> 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
index 795717fbf234..8b028ccc8bee 100644
--- 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
// <memory>
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
index e39bda017a64..240fd358e063 100644
--- 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
// <memory>
// template<class Y, class D, class A> 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
index 826862f66c74..d5577bf9b84f 100644
--- 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
// <memory>
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
index 6506890aa353..6a675e2f198d 100644
--- 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
// <memory>
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
index ce0b6e5878fa..3bf42378a199 100644
--- 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
// <optional>
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
index 018abd990336..c2fc54af504e 100644
--- 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
// <optional>
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
index fc2c46123f25..32923153477c 100644
--- 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
// <optional>
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
index 3d9e942af396..9f66f9d0d97d 100644
--- 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
// <optional>
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
index a37d0f34e65f..d8339a8fa24f 100644
--- 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
// <optional>
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
index 4533208d6b39..72192f2ed49b 100644
--- 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
// <optional>
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
index 9719a1ebda7e..3ab8fb6700b5 100644
--- 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
// <optional>
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
index 215db7f1b9a1..2b3ccc8d23ff 100644
--- 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
// <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() &&;
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
index f93913e5bd1c..477fa1d89f6f 100644
--- 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
// <optional>
//
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
index 16e2f209ce8b..3706a5cf486c 100644
--- 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
// <variant>
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
index 333f3d910383..d0a04aa88d40 100644
--- 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
// <variant>
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
index 3483298eda7a..125fe36792fa 100644
--- 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
// <variant>
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
index 4159020fbf55..e13e7b5a1864 100644
--- 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
// <variant>
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
index 1620a0239e9d..d76cfd4dcc12 100644
--- 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
// <variant>
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
index 0824761b0923..d86b2dac47ff 100644
--- 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
// <variant>
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
index 4cd210d3ddd7..701e79533609 100644
--- 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
// <variant>
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
index a26abf57ccef..0aa5169683f6 100644
--- 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
// <variant>
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
index f404c0ba726b..cd3ca7b3ef1a 100644
--- 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
// <variant>
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
index eb8c7daa2fad..d091ca706322 100644
--- 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
// <variant>
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
index 9716d05f6786..4f056d77fe15 100644
--- 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
// <variant>
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
index 75baf15143a0..307df41baa53 100644
--- 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
// <variant>
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
index d06b638e6904..a7ea9c29f924 100644
--- 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
// <variant>
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
index 47823b32e7f8..dc5279d5abe6 100644
--- 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
// <variant>
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
index 266045103232..14ee7a2900bf 100644
--- 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
// <variant>
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
index 8e68823d24ac..56cf444301ef 100644
--- 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
// <variant>
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
index 5910e50aef06..2a3b985148af 100644
--- 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
// <variant>
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
index 2c95dfeb35cc..cc8c8884d453 100644
--- 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
// <variant>
diff --git a/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp b/libcxx/test/std/utilities/variant/variant.visit/visit.pass.cpp
index 5a57164a2b60..2cc2766f59bd 100644
--- 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
// <variant>
// template <class Visitor, class... Variants>
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
index ccdf257dceb4..eb474d6d25c0 100644
--- 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
index 6fbe2ba29fee..225dadb5f02d 100644
--- a/libcxx/utils/libcxx/test/config.py
+++ b/libcxx/utils/libcxx/test/config.py
@@ -650,7 +650,7 @@ def parse_config_site_and_add_features(self, header):
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
index b6ed9b208ec8..38125f8cf6e9 100644
--- 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 <assert.h>
#include <stddef.h>
diff --git a/libcxxabi/test/catch_array_01.pass.cpp b/libcxxabi/test/catch_array_01.pass.cpp
index 03288e7da47a..f8bd4b1ae18b 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_array_02.pass.cpp b/libcxxabi/test/catch_array_02.pass.cpp
index f6228a08a56e..69cd8d50df54 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_class_01.pass.cpp b/libcxxabi/test/catch_class_01.pass.cpp
index 0a7b5eafbda6..274584083d68 100644
--- 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 <exception>
#include <stdlib.h>
diff --git a/libcxxabi/test/catch_class_02.pass.cpp b/libcxxabi/test/catch_class_02.pass.cpp
index c41572135abd..f78b581581a0 100644
--- 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 <exception>
#include <stdlib.h>
diff --git a/libcxxabi/test/catch_class_03.pass.cpp b/libcxxabi/test/catch_class_03.pass.cpp
index cbc3c32245de..450c13c688a0 100644
--- 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 <exception>
#include <stdlib.h>
diff --git a/libcxxabi/test/catch_class_04.pass.cpp b/libcxxabi/test/catch_class_04.pass.cpp
index c439f795fd16..a9656ec35fb6 100644
--- 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 <exception>
#include <stdlib.h>
diff --git a/libcxxabi/test/catch_const_pointer_nullptr.pass.cpp b/libcxxabi/test/catch_const_pointer_nullptr.pass.cpp
index 44caef594ec5..b910545c909f 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_function_01.pass.cpp b/libcxxabi/test/catch_function_01.pass.cpp
index bf962a994b47..ca52c9e7b1ef 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_function_02.pass.cpp b/libcxxabi/test/catch_function_02.pass.cpp
index f746d92d26db..195771121883 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_function_03.pass.cpp b/libcxxabi/test/catch_function_03.pass.cpp
index dbc72c722c1e..217500e700ec 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_in_noexcept.pass.cpp b/libcxxabi/test/catch_in_noexcept.pass.cpp
index 94af4dfb3d7e..8f0ade78e6d6 100644
--- 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 <exception>
#include <stdlib.h>
diff --git a/libcxxabi/test/catch_member_data_pointer_01.pass.cpp b/libcxxabi/test/catch_member_data_pointer_01.pass.cpp
index 6536515a30be..765395968373 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_member_function_pointer_01.pass.cpp b/libcxxabi/test/catch_member_function_pointer_01.pass.cpp
index 3dc21dfc563c..f1d4e8d795b1 100644
--- 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 <cassert>
struct A
diff --git a/libcxxabi/test/catch_member_function_pointer_02.pass.cpp b/libcxxabi/test/catch_member_function_pointer_02.pass.cpp
index 41356e5daa7c..c38a9306c41c 100644
--- 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
index a6e746876920..54d4fd2af7da 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_multi_level_pointer.pass.cpp b/libcxxabi/test/catch_multi_level_pointer.pass.cpp
index fcd6ecd247cb..be5a1105d5f5 100644
--- 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 <cassert>
#include <cstdlib>
diff --git a/libcxxabi/test/catch_pointer_nullptr.pass.cpp b/libcxxabi/test/catch_pointer_nullptr.pass.cpp
index bd1db8cb48d8..c093d52cc66a 100644
--- 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 <cassert>
#include <cstdlib>
diff --git a/libcxxabi/test/catch_pointer_reference.pass.cpp b/libcxxabi/test/catch_pointer_reference.pass.cpp
index eff950f1ee13..6ea0cae5d669 100644
--- 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 <exception>
#include <stdlib.h>
diff --git a/libcxxabi/test/catch_ptr.pass.cpp b/libcxxabi/test/catch_ptr.pass.cpp
index 0255b7fd48c6..b2d8999120a6 100644
--- 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 <exception>
#include <stdlib.h>
diff --git a/libcxxabi/test/catch_ptr_02.pass.cpp b/libcxxabi/test/catch_ptr_02.pass.cpp
index 9c24e11df54e..d20076d22a6e 100644
--- 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 <cassert>
diff --git a/libcxxabi/test/catch_reference_nullptr.pass.cpp b/libcxxabi/test/catch_reference_nullptr.pass.cpp
index 0d7ac96e2f4c..a15eb3c719a6 100644
--- 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 <cassert>
#include <cstdlib>
diff --git a/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp b/libcxxabi/test/cxa_vec_new_overflow_PR41395.pass.cpp
index 67b060e5de3e..84ba978f9dc1 100644
--- 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 <new>
diff --git a/libcxxabi/test/exception_object_alignment.2.pass.cpp b/libcxxabi/test/exception_object_alignment.2.pass.cpp
index 33f0f9e5825a..b35e72862991 100644
--- 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
index a22523d7ac96..df9f37b2e133 100644
--- 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
index 32c66f4c0cca..89221f105f71 100644
--- 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
index a762d2f9c60e..999c172dd5b5 100644
--- 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
index 784637621697..ac92ab4dc6c2 100644
--- 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
index 5f652c2f00c0..fe76d193e79e 100644
--- a/libcxxabi/test/libcxxabi/test/config.py
+++ b/libcxxabi/test/libcxxabi/test/config.py
@@ -39,7 +39,7 @@ def has_cpp_feature(self, feature, required_value):
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
index 49166dad846c..f8a80e8e1824 100644
--- 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
index 40139bbd87bc..0d8bdee9b85e 100644
--- 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
index b3471dd23fe9..129bc93d58f4 100644
--- 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 <cxxabi.h>
#include <exception>
diff --git a/libcxxabi/test/noexception2.pass.cpp b/libcxxabi/test/noexception2.pass.cpp
index b377d9ec6b58..f2851ebba4de 100644
--- 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 <cxxabi.h>
#include <exception>
diff --git a/libcxxabi/test/noexception3.pass.cpp b/libcxxabi/test/noexception3.pass.cpp
index 42d02a61569f..005dba032861 100644
--- 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 <cxxabi.h>
#include <exception>
diff --git a/libcxxabi/test/noexception4.pass.cpp b/libcxxabi/test/noexception4.pass.cpp
index 00c71621f45f..a1349ee91876 100644
--- a/libcxxabi/test/noexception4.pass.cpp
+++ b/libcxxabi/test/noexception4.pass.cpp
@@ -6,7 +6,7 @@
//
//===----------------------------------------------------------------------===//
-// REQUIRES: libcxxabi-no-exceptions
+// REQUIRES: no-exceptions
#include <cxxabi.h>
#include <exception>
diff --git a/libcxxabi/test/test_aux_runtime.pass.cpp b/libcxxabi/test/test_aux_runtime.pass.cpp
index 4f0c1748f96a..585fd7dcbc67 100644
--- 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 <typeinfo>
#include <iostream>
diff --git a/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp b/libcxxabi/test/test_aux_runtime_op_array_new.pass.cpp
index 3e77d99b0621..928e32459223 100644
--- 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 <iostream>
#include <cxxabi.h>
diff --git a/libcxxabi/test/test_exception_address_alignment.pass.cpp b/libcxxabi/test/test_exception_address_alignment.pass.cpp
index 16a896fe2f02..c0dab000574e 100644
--- 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
index f923aa4ff215..21b5e860e143 100644
--- 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
index 4068b7fc9dfe..9b7e671d26c0 100644
--- 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
index 626f4cba1154..6a04c7179512 100644
--- 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
index f4b2d3651002..3474e0c3c514 100644
--- 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 <cxxabi.h>
#include <cassert>
diff --git a/libcxxabi/test/unwind_01.pass.cpp b/libcxxabi/test/unwind_01.pass.cpp
index 97e10eb56f21..f71596127bf2 100644
--- 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 <assert.h>
diff --git a/libcxxabi/test/unwind_02.pass.cpp b/libcxxabi/test/unwind_02.pass.cpp
index e7a8479f9b63..99a481746b6a 100644
--- 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 <assert.h>
diff --git a/libcxxabi/test/unwind_03.pass.cpp b/libcxxabi/test/unwind_03.pass.cpp
index 38962c6c3f86..5016a5fc2a6a 100644
--- 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 <exception>
diff --git a/libcxxabi/test/unwind_04.pass.cpp b/libcxxabi/test/unwind_04.pass.cpp
index 45669c354b3f..7e10e8a9e216 100644
--- 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 <exception>
diff --git a/libcxxabi/test/unwind_05.pass.cpp b/libcxxabi/test/unwind_05.pass.cpp
index efd724a83a6d..8c6db8898485 100644
--- 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 <exception>
diff --git a/libcxxabi/test/unwind_06.pass.cpp b/libcxxabi/test/unwind_06.pass.cpp
index a305d3d03fa2..1bcb89c1cab0 100644
--- 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 <exception>
#include <stdlib.h>
diff --git a/libunwind/test/libunwind/test/config.py b/libunwind/test/libunwind/test/config.py
index 41ca3f9b4a44..36501f230272 100644
--- a/libunwind/test/libunwind/test/config.py
+++ b/libunwind/test/libunwind/test/config.py
@@ -36,7 +36,7 @@ def has_cpp_feature(self, feature, required_value):
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')
More information about the libcxx-commits
mailing list