diff --git a/libcxx/test/libcxx/containers/unord/unord.set/missing_hash_specialization.fail.cpp b/libcxx/test/libcxx/containers/unord/unord.set/missing_hash_specialization.verify.cpp rename from libcxx/test/libcxx/containers/unord/unord.set/missing_hash_specialization.fail.cpp rename to libcxx/test/libcxx/containers/unord/unord.set/missing_hash_specialization.verify.cpp diff --git a/libcxx/test/libcxx/depr/exception.unexpected/unexpected_disabled_cpp17.fail.cpp b/libcxx/test/libcxx/depr/exception.unexpected/unexpected_disabled_cpp17.verify.cpp rename from libcxx/test/libcxx/depr/exception.unexpected/unexpected_disabled_cpp17.fail.cpp rename to libcxx/test/libcxx/depr/exception.unexpected/unexpected_disabled_cpp17.verify.cpp diff --git a/libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp b/libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.verify.cpp rename from libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.fail.cpp rename to libcxx/test/libcxx/utilities/memory/util.smartptr/util.smartptr.shared/function_type_default_deleter.verify.cpp diff --git a/libcxx/test/libcxx/utilities/variant/variant.variant/variant.helper/variant_alternative.fail.cpp b/libcxx/test/libcxx/utilities/variant/variant.variant/variant.helper/variant_alternative.verify.cpp rename from libcxx/test/libcxx/utilities/variant/variant.variant/variant.helper/variant_alternative.fail.cpp rename to libcxx/test/libcxx/utilities/variant/variant.variant/variant.helper/variant_alternative.verify.cpp diff --git a/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp b/libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.verify.cpp rename from libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.fail.cpp rename to libcxx/test/std/algorithms/alg.modifying.operations/alg.random.sample/sample.verify.cpp diff --git a/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.fail.cpp b/libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.verify.cpp rename from libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.fail.cpp rename to libcxx/test/std/algorithms/alg.sorting/alg.min.max/requires_forward_iterator.verify.cpp diff --git a/libcxx/test/std/containers/associative/map/map.cons/deduct.fail.cpp b/libcxx/test/std/containers/associative/map/map.cons/deduct.verify.cpp rename from libcxx/test/std/containers/associative/map/map.cons/deduct.fail.cpp rename to libcxx/test/std/containers/associative/map/map.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/deduct.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/deduct.verify.cpp rename from libcxx/test/std/containers/associative/multimap/multimap.cons/deduct.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/deduct.fail.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/deduct.verify.cpp rename from libcxx/test/std/containers/associative/multiset/multiset.cons/deduct.fail.cpp rename to libcxx/test/std/containers/associative/multiset/multiset.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/associative/set/set.cons/deduct.fail.cpp b/libcxx/test/std/containers/associative/set/set.cons/deduct.verify.cpp rename from libcxx/test/std/containers/associative/set/set.cons/deduct.fail.cpp rename to libcxx/test/std/containers/associative/set/set.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.fail.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.verify.cpp rename from libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.fail.cpp rename to libcxx/test/std/containers/container.adaptors/priority.queue/priqueue.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.cons/deduct.fail.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.cons/deduct.verify.cpp rename from libcxx/test/std/containers/container.adaptors/queue/queue.cons/deduct.fail.cpp rename to libcxx/test/std/containers/container.adaptors/queue/queue.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.cons/deduct.fail.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.cons/deduct.verify.cpp rename from libcxx/test/std/containers/container.adaptors/stack/stack.cons/deduct.fail.cpp rename to libcxx/test/std/containers/container.adaptors/stack/stack.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/sequences/array/array.cons/deduct.fail.cpp b/libcxx/test/std/containers/sequences/array/array.cons/deduct.verify.cpp rename from libcxx/test/std/containers/sequences/array/array.cons/deduct.fail.cpp rename to libcxx/test/std/containers/sequences/array/array.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/sequences/array/array.creation/to_array.fail.cpp b/libcxx/test/std/containers/sequences/array/array.creation/to_array.verify.cpp rename from libcxx/test/std/containers/sequences/array/array.creation/to_array.fail.cpp rename to libcxx/test/std/containers/sequences/array/array.creation/to_array.verify.cpp diff --git a/libcxx/test/std/containers/sequences/array/array.fill/fill.fail.cpp b/libcxx/test/std/containers/sequences/array/array.fill/fill.verify.cpp rename from libcxx/test/std/containers/sequences/array/array.fill/fill.fail.cpp rename to libcxx/test/std/containers/sequences/array/array.fill/fill.verify.cpp diff --git a/libcxx/test/std/containers/sequences/array/array.swap/swap.fail.cpp b/libcxx/test/std/containers/sequences/array/array.swap/swap.verify.cpp rename from libcxx/test/std/containers/sequences/array/array.swap/swap.fail.cpp rename to libcxx/test/std/containers/sequences/array/array.swap/swap.verify.cpp diff --git a/libcxx/test/std/containers/sequences/deque/deque.cons/deduct.fail.cpp b/libcxx/test/std/containers/sequences/deque/deque.cons/deduct.verify.cpp rename from libcxx/test/std/containers/sequences/deque/deque.cons/deduct.fail.cpp rename to libcxx/test/std/containers/sequences/deque/deque.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.verify.cpp rename from libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.fail.cpp rename to libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/sequences/list/list.cons/deduct.fail.cpp b/libcxx/test/std/containers/sequences/list/list.cons/deduct.verify.cpp rename from libcxx/test/std/containers/sequences/list/list.cons/deduct.fail.cpp rename to libcxx/test/std/containers/sequences/list/list.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/sequences/vector/vector.cons/deduct.fail.cpp b/libcxx/test/std/containers/sequences/vector/vector.cons/deduct.verify.cpp rename from libcxx/test/std/containers/sequences/vector/vector.cons/deduct.fail.cpp rename to libcxx/test/std/containers/sequences/vector/vector.cons/deduct.verify.cpp diff --git a/libcxx/test/std/containers/sequences/vector/vector.modifiers/resize_not_move_insertable.fail.cpp b/libcxx/test/std/containers/sequences/vector/vector.modifiers/resize_not_move_insertable.verify.cpp rename from libcxx/test/std/containers/sequences/vector/vector.modifiers/resize_not_move_insertable.fail.cpp rename to libcxx/test/std/containers/sequences/vector/vector.modifiers/resize_not_move_insertable.verify.cpp diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/deduct.fail.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/deduct.verify.cpp rename from libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/deduct.fail.cpp rename to libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/deduct.verify.cpp diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/deduct.fail.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/deduct.verify.cpp rename from libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/deduct.fail.cpp rename to libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/deduct.verify.cpp diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/deduct.fail.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/deduct.verify.cpp rename from libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/deduct.fail.cpp rename to libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/deduct.verify.cpp diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/deduct.fail.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/deduct.verify.cpp rename from libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/deduct.fail.cpp rename to libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/deduct.verify.cpp diff --git a/libcxx/test/std/containers/views/views.span/span.cons/span.fail.cpp b/libcxx/test/std/containers/views/views.span/span.cons/span.verify.cpp rename from libcxx/test/std/containers/views/views.span/span.cons/span.fail.cpp rename to libcxx/test/std/containers/views/views.span/span.cons/span.verify.cpp diff --git a/libcxx/test/std/experimental/memory/memory.resource/construct.fail.cpp b/libcxx/test/std/experimental/memory/memory.resource/construct.verify.cpp rename from libcxx/test/std/experimental/memory/memory.resource/construct.fail.cpp rename to libcxx/test/std/experimental/memory/memory.resource/construct.verify.cpp diff --git a/libcxx/test/std/experimental/memory/memory.resource/memory.resource.priv/private_members.fail.cpp b/libcxx/test/std/experimental/memory/memory.resource/memory.resource.priv/private_members.verify.cpp rename from libcxx/test/std/experimental/memory/memory.resource/memory.resource.priv/private_members.fail.cpp rename to libcxx/test/std/experimental/memory/memory.resource/memory.resource.priv/private_members.verify.cpp diff --git a/libcxx/test/std/experimental/utilities/meta/meta.detect/nonesuch.fail.cpp b/libcxx/test/std/experimental/utilities/meta/meta.detect/nonesuch.verify.cpp rename from libcxx/test/std/experimental/utilities/meta/meta.detect/nonesuch.fail.cpp rename to libcxx/test/std/experimental/utilities/meta/meta.detect/nonesuch.verify.cpp diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.fail.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.verify.cpp rename from libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.fail.cpp rename to libcxx/test/std/input.output/filesystems/class.path/path.nonmember/append_op.verify.cpp diff --git a/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/comparison_ops.fail.cpp b/libcxx/test/std/input.output/filesystems/class.path/path.nonmember/comparison_ops.verify.cpp rename from libcxx/test/std/input.output/filesystems/class.path/path.nonmember/comparison_ops.fail.cpp rename to libcxx/test/std/input.output/filesystems/class.path/path.nonmember/comparison_ops.verify.cpp diff --git a/libcxx/test/std/input.output/iostream.format/input.streams/istream/istream.cons/copy.fail.cpp b/libcxx/test/std/input.output/iostream.format/input.streams/istream/istream.cons/copy.verify.cpp rename from libcxx/test/std/input.output/iostream.format/input.streams/istream/istream.cons/copy.fail.cpp rename to libcxx/test/std/input.output/iostream.format/input.streams/istream/istream.cons/copy.verify.cpp diff --git a/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.fail.cpp b/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.verify.cpp rename from libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.fail.cpp rename to libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.cons/copy.verify.cpp diff --git a/libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.fail.cpp b/libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.verify.cpp rename from libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.fail.cpp rename to libcxx/test/std/iterators/iterator.primitives/iterator.traits/empty.verify.cpp diff --git a/libcxx/test/std/language.support/support.dynamic/ptr.launder/launder.types.fail.cpp b/libcxx/test/std/language.support/support.dynamic/ptr.launder/launder.types.verify.cpp rename from libcxx/test/std/language.support/support.dynamic/ptr.launder/launder.types.fail.cpp rename to libcxx/test/std/language.support/support.dynamic/ptr.launder/launder.types.verify.cpp diff --git a/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.fail.cpp b/libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.verify.cpp rename from libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.fail.cpp rename to libcxx/test/std/numerics/bit/bit.pow.two/bit_ceil.verify.cpp diff --git a/libcxx/test/std/numerics/complex.number/cmplx.over/UDT_is_rejected.fail.cpp b/libcxx/test/std/numerics/complex.number/cmplx.over/UDT_is_rejected.verify.cpp rename from libcxx/test/std/numerics/complex.number/cmplx.over/UDT_is_rejected.fail.cpp rename to libcxx/test/std/numerics/complex.number/cmplx.over/UDT_is_rejected.verify.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.verify.cpp rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.midpoint/midpoint.verify.cpp diff --git a/libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.fail.cpp b/libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.verify.cpp rename from libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.fail.cpp rename to libcxx/test/std/numerics/rand/rand.eng/rand.eng.lcong/params.verify.cpp diff --git a/libcxx/test/std/re/re.regex/re.regex.construct/deduct.fail.cpp b/libcxx/test/std/re/re.regex/re.regex.construct/deduct.verify.cpp rename from libcxx/test/std/re/re.regex/re.regex.construct/deduct.fail.cpp rename to libcxx/test/std/re/re.regex/re.regex.construct/deduct.verify.cpp diff --git a/libcxx/test/std/strings/basic.string.hash/char_type_hash.fail.cpp b/libcxx/test/std/strings/basic.string.hash/char_type_hash.verify.cpp rename from libcxx/test/std/strings/basic.string.hash/char_type_hash.fail.cpp rename to libcxx/test/std/strings/basic.string.hash/char_type_hash.verify.cpp diff --git a/libcxx/test/std/strings/string.view/char.bad.fail.cpp b/libcxx/test/std/strings/string.view/char.bad.verify.cpp rename from libcxx/test/std/strings/string.view/char.bad.fail.cpp rename to libcxx/test/std/strings/string.view/char.bad.verify.cpp diff --git a/libcxx/test/std/strings/string.view/string.view.hash/char_type.hash.fail.cpp b/libcxx/test/std/strings/string.view/string.view.hash/char_type.hash.verify.cpp rename from libcxx/test/std/strings/string.view/string.view.hash/char_type.hash.fail.cpp rename to libcxx/test/std/strings/string.view/string.view.hash/char_type.hash.verify.cpp diff --git a/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.verify.cpp rename from libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.fail.cpp rename to libcxx/test/std/thread/futures/futures.task/futures.task.members/assign_copy.verify.cpp diff --git a/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.verify.cpp rename from libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.fail.cpp rename to libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor1.verify.cpp diff --git a/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp b/libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.verify.cpp rename from libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.fail.cpp rename to libcxx/test/std/thread/futures/futures.task/futures.task.members/ctor_copy.verify.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.verify.cpp rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/mutex.verify.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/assign.verify.cpp rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/assign.verify.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/copy.verify.cpp rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/copy.verify.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/mutex.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/mutex.verify.cpp rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/mutex.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.scoped/mutex.verify.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/assign.verify.cpp rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/assign.verify.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/copy.verify.cpp rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.shared_mutex.requirements/thread.shared_mutex.class/copy.verify.cpp diff --git a/libcxx/test/std/time/time.hms/hhmmss.fail.cpp b/libcxx/test/std/time/time.hms/hhmmss.verify.cpp rename from libcxx/test/std/time/time.hms/hhmmss.fail.cpp rename to libcxx/test/std/time/time.hms/hhmmss.verify.cpp diff --git a/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.fail.cpp b/libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.verify.cpp rename from libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.fail.cpp rename to libcxx/test/std/time/time.cal/time.cal.day/time.cal.day.nonmembers/literals.verify.cpp diff --git a/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.fail.cpp b/libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.verify.cpp rename from libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.fail.cpp rename to libcxx/test/std/time/time.cal/time.cal.year/time.cal.year.nonmembers/literals.verify.cpp diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.verify.cpp rename from libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.fail.cpp rename to libcxx/test/std/utilities/any/any.nonmembers/any.cast/any_cast_request_invalid_value_category.verify.cpp diff --git a/libcxx/test/std/utilities/any/any.nonmembers/any.cast/reference_types.fail.cpp b/libcxx/test/std/utilities/any/any.nonmembers/any.cast/reference_types.verify.cpp rename from libcxx/test/std/utilities/any/any.nonmembers/any.cast/reference_types.fail.cpp rename to libcxx/test/std/utilities/any/any.nonmembers/any.cast/reference_types.verify.cpp diff --git a/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.bool.fail.cpp b/libcxx/test/std/utilities/charconv/charconv.from.chars/integral.bool.verify.cpp rename from libcxx/test/std/utilities/charconv/charconv.from.chars/integral.bool.fail.cpp rename to libcxx/test/std/utilities/charconv/charconv.from.chars/integral.bool.verify.cpp diff --git a/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.bool.fail.cpp b/libcxx/test/std/utilities/charconv/charconv.to.chars/integral.bool.verify.cpp rename from libcxx/test/std/utilities/charconv/charconv.to.chars/integral.bool.fail.cpp rename to libcxx/test/std/utilities/charconv/charconv.to.chars/integral.bool.verify.cpp diff --git a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.fail.cpp b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.verify.cpp rename from libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.fail.cpp rename to libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.verify.cpp --- a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.fail.cpp +++ b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq.verify.cpp @@ -17,22 +17,15 @@ // UNSUPPORTED: stdlib=libstdc++ #include -#include -#include #include "test_macros.h" -int main(int, char**) -{ - typedef std::make_integer_sequence MakeSeqT; +typedef std::make_integer_sequence MakeSeqT; - // std::make_integer_sequence is implemented using a compiler builtin if available. - // this builtin has different diagnostic messages than the fallback implementation. -#if TEST_HAS_BUILTIN(__make_integer_seq) && !defined(_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE) - MakeSeqT i; // expected-error@*:* {{integer sequences must have non-negative sequence length}} +// std::make_integer_sequence is implemented using a compiler builtin if available. +// this builtin has different diagnostic messages than the fallback implementation. +#if TEST_HAS_BUILTIN(__make_integer_seq) +MakeSeqT i; // expected-error@*:* {{integer sequences must have non-negative sequence length}} #else - MakeSeqT i; // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed{{.*}}std::make_integer_sequence must have a non-negative sequence length}} +MakeSeqT i; // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed{{.*}}std::make_integer_sequence must have a non-negative sequence length}} #endif - - return 0; -} diff --git a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.compile.fail.cpp b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.verify.cpp rename from libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.compile.fail.cpp rename to libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.verify.cpp --- a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.compile.fail.cpp +++ b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.verify.cpp @@ -16,5 +16,9 @@ // This test hangs during recursive template instantiation with libstdc++ // UNSUPPORTED: stdlib=libstdc++ -#define _LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE -#include "make_integer_seq.fail.cpp" +// ADDITIONAL_COMPILE_FLAGS: -D_LIBCPP_TESTING_FALLBACK_MAKE_INTEGER_SEQUENCE + +#include + +typedef std::make_integer_sequence MakeSeqT; +MakeSeqT i; // expected-error-re@*:* {{{{(static_assert|static assertion)}} failed{{.*}}std::make_integer_sequence must have a non-negative sequence length}} diff --git a/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.fail.cpp b/libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.verify.cpp rename from libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.fail.cpp rename to libcxx/test/std/utilities/memory/unique.ptr/unique.ptr.special/io.verify.cpp diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.fail.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.verify.cpp rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.fail.cpp rename to libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.const/shared_ptr_copy_move.verify.cpp diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.fail.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.verify.cpp rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.fail.cpp rename to libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_arrow.verify.cpp diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.fail.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.verify.cpp rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.fail.cpp rename to libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.obs/op_bracket.verify.cpp diff --git a/libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.fail.cpp b/libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.verify.cpp rename from libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.fail.cpp rename to libcxx/test/std/utilities/meta/meta.const.eval/is_constant_evaluated.verify.cpp diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.fail.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.verify.cpp rename from libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.fail.cpp rename to libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/underlying_type.verify.cpp diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/ctor.fail.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/ctor.verify.cpp rename from libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/ctor.fail.cpp rename to libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/ctor.verify.cpp diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.verify.cpp rename from libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.fail.cpp rename to libcxx/test/std/utilities/optional/optional.object/optional.object.ctor/deduct.verify.cpp diff --git a/libcxx/test/std/utilities/optional/optional.object/optional_requires_destructible_object.fail.cpp b/libcxx/test/std/utilities/optional/optional.object/optional_requires_destructible_object.verify.cpp rename from libcxx/test/std/utilities/optional/optional.object/optional_requires_destructible_object.fail.cpp rename to libcxx/test/std/utilities/optional/optional.object/optional_requires_destructible_object.verify.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.verify.cpp rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.ctor/pointer_deleter.verify.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.verify.cpp rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.modifiers/reset.runtime.verify.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.verify.cpp rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.class/unique.ptr.observers/op_subscript.single.verify.cpp diff --git a/libcxx/test/std/utilities/utility/forward/forward.fail.cpp b/libcxx/test/std/utilities/utility/forward/forward.verify.cpp rename from libcxx/test/std/utilities/utility/forward/forward.fail.cpp rename to libcxx/test/std/utilities/utility/forward/forward.verify.cpp diff --git a/libcxx/test/std/utilities/utility/forward/move.fail.cpp b/libcxx/test/std/utilities/utility/forward/move.verify.cpp rename from libcxx/test/std/utilities/utility/forward/move.fail.cpp rename to libcxx/test/std/utilities/utility/forward/move.verify.cpp diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/construct.fail.cpp b/libcxx/test/std/utilities/utility/mem.res/mem.res/construct.verify.cpp rename from libcxx/test/std/utilities/utility/mem.res/mem.res/construct.fail.cpp rename to libcxx/test/std/utilities/utility/mem.res/mem.res/construct.verify.cpp diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/private_members.fail.cpp b/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/private_members.verify.cpp rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/private_members.fail.cpp rename to libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/private_members.verify.cpp diff --git a/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/protected_members.fail.cpp b/libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/protected_members.verify.cpp rename from libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/protected_members.fail.cpp rename to libcxx/test/std/utilities/utility/mem.res/mem.res/mem.res.private/protected_members.verify.cpp diff --git a/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.fail.cpp b/libcxx/test/std/utilities/utility/utility.intcmp/intcmp.verify.cpp rename from libcxx/test/std/utilities/utility/utility.intcmp/intcmp.fail.cpp rename to libcxx/test/std/utilities/utility/utility.intcmp/intcmp.verify.cpp diff --git a/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.fail.cpp b/libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.verify.cpp rename from libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.fail.cpp rename to libcxx/test/std/utilities/variant/variant.helpers/variant_alternative.verify.cpp diff --git a/libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.fail.cpp b/libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.verify.cpp rename from libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.fail.cpp rename to libcxx/test/std/utilities/variant/variant.relops/relops_bool_conv.verify.cpp diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.verify.cpp rename from libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.fail.cpp rename to libcxx/test/std/utilities/variant/variant.variant/variant.assign/copy.verify.cpp diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_array.verify.cpp rename from libcxx/test/std/utilities/variant/variant.variant/variant_array.fail.cpp rename to libcxx/test/std/utilities/variant/variant.variant/variant_array.verify.cpp diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_empty.verify.cpp rename from libcxx/test/std/utilities/variant/variant.variant/variant_empty.fail.cpp rename to libcxx/test/std/utilities/variant/variant.variant/variant_empty.verify.cpp diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_reference.verify.cpp rename from libcxx/test/std/utilities/variant/variant.variant/variant_reference.fail.cpp rename to libcxx/test/std/utilities/variant/variant.variant/variant_reference.verify.cpp diff --git a/libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp b/libcxx/test/std/utilities/variant/variant.variant/variant_void.verify.cpp rename from libcxx/test/std/utilities/variant/variant.variant/variant_void.fail.cpp rename to libcxx/test/std/utilities/variant/variant.variant/variant_void.verify.cpp