diff --git a/libcxx/test/libcxx/atomics/libcpp-has-no-threads.fail.cpp b/libcxx/test/libcxx/atomics/libcpp-has-no-threads.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/atomics/libcpp-has-no-threads.fail.cpp rename to libcxx/test/libcxx/atomics/libcpp-has-no-threads.compile.fail.cpp diff --git a/libcxx/test/libcxx/extensions/hash/specializations.fail.cpp b/libcxx/test/libcxx/extensions/hash/specializations.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/extensions/hash/specializations.fail.cpp rename to libcxx/test/libcxx/extensions/hash/specializations.compile.fail.cpp diff --git a/libcxx/test/libcxx/extensions/hash_map/const_iterator.fail.cpp b/libcxx/test/libcxx/extensions/hash_map/const_iterator.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/extensions/hash_map/const_iterator.fail.cpp rename to libcxx/test/libcxx/extensions/hash_map/const_iterator.compile.fail.cpp diff --git a/libcxx/test/libcxx/input.output/file.streams/c.files/no.global.filesystem.namespace/fopen.fail.cpp b/libcxx/test/libcxx/input.output/file.streams/c.files/no.global.filesystem.namespace/fopen.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/input.output/file.streams/c.files/no.global.filesystem.namespace/fopen.fail.cpp rename to libcxx/test/libcxx/input.output/file.streams/c.files/no.global.filesystem.namespace/fopen.compile.fail.cpp diff --git a/libcxx/test/libcxx/input.output/file.streams/c.files/no.global.filesystem.namespace/rename.fail.cpp b/libcxx/test/libcxx/input.output/file.streams/c.files/no.global.filesystem.namespace/rename.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/input.output/file.streams/c.files/no.global.filesystem.namespace/rename.fail.cpp rename to libcxx/test/libcxx/input.output/file.streams/c.files/no.global.filesystem.namespace/rename.compile.fail.cpp diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-error-without-verify.fail.cpp b/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-failure.fail.cpp similarity index 75% rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-error-without-verify.fail.cpp rename to libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-failure.fail.cpp index ae8bf0b5e981..245ade41cdf6 100644 --- a/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-error-without-verify.fail.cpp +++ b/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-failure.fail.cpp @@ -6,9 +6,10 @@ // //===----------------------------------------------------------------------===// -// Make sure the test passes if it fails at compile-time, without verify +// Make sure the test passes if we don't have clang-verify support and +// the test fails to compile. + +// UNSUPPORTED: verify-support struct Foo { }; typedef Foo::x x; - -int main() { } diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-success.fail.cpp b/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-success.fail.cpp index 1cec8a3632c1..3613dae3b9c2 100644 --- a/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-success.fail.cpp +++ b/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-success.fail.cpp @@ -8,6 +8,9 @@ // XFAIL: * -// Make sure the test DOES NOT pass if it succeeds at compile-time +// Make sure the test DOES NOT pass if we don't have clang-verify support and +// the test compiles successfully. + +// UNSUPPORTED: verify-support int main() { } diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics-unmarked.fail.cpp b/libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics-unmarked.fail.cpp new file mode 100644 index 000000000000..e0ca921f3438 --- /dev/null +++ b/libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics-unmarked.fail.cpp @@ -0,0 +1,19 @@ +//===----------------------------------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +// REQUIRES: verify-support + +// XFAIL: * + +// Make sure the test DOES NOT pass if there are no diagnostics, but we didn't +// use the 'expected-no-diagnostics' markup. +// +// Note: For the purpose of this test, make sure the file would otherwise +// compile to make sure we really fail due to a lack of markup. + +int main() { } diff --git a/libcxx/test/libcxx/selftest/test.fail.cpp b/libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics.fail.cpp similarity index 71% rename from libcxx/test/libcxx/selftest/test.fail.cpp rename to libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics.fail.cpp index 7b091c51d14e..817296100375 100644 --- a/libcxx/test/libcxx/selftest/test.fail.cpp +++ b/libcxx/test/libcxx/selftest/newformat/fail.cpp/no-diagnostics.fail.cpp @@ -1,4 +1,3 @@ -// -*- C++ -*- //===----------------------------------------------------------------------===// // // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. @@ -7,4 +6,9 @@ // //===----------------------------------------------------------------------===// -#error This test should not compile. +// REQUIRES: verify-support + +// Make sure the test passes if we expected no diagnostics and included +// the markup. + +// expected-no-diagnostics diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-error-with-verify.fail.cpp b/libcxx/test/libcxx/selftest/newformat/fail.cpp/right-diagnostic.fail.cpp similarity index 79% rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-error-with-verify.fail.cpp rename to libcxx/test/libcxx/selftest/newformat/fail.cpp/right-diagnostic.fail.cpp index 4442c784e12b..95c36681590d 100644 --- a/libcxx/test/libcxx/selftest/newformat/fail.cpp/compile-error-with-verify.fail.cpp +++ b/libcxx/test/libcxx/selftest/newformat/fail.cpp/right-diagnostic.fail.cpp @@ -6,7 +6,10 @@ // //===----------------------------------------------------------------------===// -// Make sure the test passes if it fails at compile-time, with verify +// REQUIRES: verify-support + +// Make sure the test passes if it fails at compile-time with the expected +// diagnostic. struct Foo { }; typedef Foo::x x; // expected-error{{no type named 'x' in 'Foo'}} diff --git a/libcxx/test/libcxx/selftest/newformat/fail.cpp/wrong-expected.fail.cpp b/libcxx/test/libcxx/selftest/newformat/fail.cpp/wrong-diagnostic.fail.cpp similarity index 83% rename from libcxx/test/libcxx/selftest/newformat/fail.cpp/wrong-expected.fail.cpp rename to libcxx/test/libcxx/selftest/newformat/fail.cpp/wrong-diagnostic.fail.cpp index d06759fb8172..2072b8a8337e 100644 --- a/libcxx/test/libcxx/selftest/newformat/fail.cpp/wrong-expected.fail.cpp +++ b/libcxx/test/libcxx/selftest/newformat/fail.cpp/wrong-diagnostic.fail.cpp @@ -10,8 +10,7 @@ // XFAIL: * -// Make sure the test DOES NOT pass if it fails at compile-time, but the -// expected-error is wrong. +// Make sure the test DOES NOT pass if the expected diagnostic is wrong. struct Foo { }; typedef Foo::x x; // expected-error{{this is not found in the errors}} diff --git a/libcxx/test/libcxx/utilities/meta/meta.unary/meta.unary.prop/missing_is_aggregate_trait.fail.cpp b/libcxx/test/libcxx/utilities/meta/meta.unary/meta.unary.prop/missing_is_aggregate_trait.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/utilities/meta/meta.unary/meta.unary.prop/missing_is_aggregate_trait.fail.cpp rename to libcxx/test/libcxx/utilities/meta/meta.unary/meta.unary.prop/missing_is_aggregate_trait.compile.fail.cpp diff --git a/libcxx/test/libcxx/utilities/time/date.time/asctime.thread-unsafe.fail.cpp b/libcxx/test/libcxx/utilities/time/date.time/asctime.thread-unsafe.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/utilities/time/date.time/asctime.thread-unsafe.fail.cpp rename to libcxx/test/libcxx/utilities/time/date.time/asctime.thread-unsafe.compile.fail.cpp diff --git a/libcxx/test/libcxx/utilities/time/date.time/ctime.thread-unsafe.fail.cpp b/libcxx/test/libcxx/utilities/time/date.time/ctime.thread-unsafe.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/utilities/time/date.time/ctime.thread-unsafe.fail.cpp rename to libcxx/test/libcxx/utilities/time/date.time/ctime.thread-unsafe.compile.fail.cpp diff --git a/libcxx/test/libcxx/utilities/time/date.time/gmtime.thread-unsafe.fail.cpp b/libcxx/test/libcxx/utilities/time/date.time/gmtime.thread-unsafe.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/utilities/time/date.time/gmtime.thread-unsafe.fail.cpp rename to libcxx/test/libcxx/utilities/time/date.time/gmtime.thread-unsafe.compile.fail.cpp diff --git a/libcxx/test/libcxx/utilities/time/date.time/localtime.thread-unsafe.fail.cpp b/libcxx/test/libcxx/utilities/time/date.time/localtime.thread-unsafe.compile.fail.cpp similarity index 100% rename from libcxx/test/libcxx/utilities/time/date.time/localtime.thread-unsafe.fail.cpp rename to libcxx/test/libcxx/utilities/time/date.time/localtime.thread-unsafe.compile.fail.cpp diff --git a/libcxx/test/std/atomics/atomics.flag/copy_assign.fail.cpp b/libcxx/test/std/atomics/atomics.flag/copy_assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/atomics/atomics.flag/copy_assign.fail.cpp rename to libcxx/test/std/atomics/atomics.flag/copy_assign.compile.fail.cpp diff --git a/libcxx/test/std/atomics/atomics.flag/copy_ctor.fail.cpp b/libcxx/test/std/atomics/atomics.flag/copy_ctor.compile.fail.cpp similarity index 100% rename from libcxx/test/std/atomics/atomics.flag/copy_ctor.fail.cpp rename to libcxx/test/std/atomics/atomics.flag/copy_ctor.compile.fail.cpp diff --git a/libcxx/test/std/atomics/atomics.flag/copy_volatile_assign.fail.cpp b/libcxx/test/std/atomics/atomics.flag/copy_volatile_assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/atomics/atomics.flag/copy_volatile_assign.fail.cpp rename to libcxx/test/std/atomics/atomics.flag/copy_volatile_assign.compile.fail.cpp diff --git a/libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.fail.cpp b/libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.compile.fail.cpp similarity index 100% rename from libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.fail.cpp rename to libcxx/test/std/atomics/atomics.types.generic/trivially_copyable.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/associative/map/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/associative/map/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.cons/compare_copy_constructible.fail.cpp b/libcxx/test/std/containers/associative/map/map.cons/compare_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.cons/compare_copy_constructible.fail.cpp rename to libcxx/test/std/containers/associative/map/map.cons/compare_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/count1.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/count1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/count2.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/count2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/count3.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/count3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/equal_range1.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/equal_range1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/equal_range2.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/equal_range2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/equal_range3.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/equal_range3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/find1.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/find1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/find2.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/find2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/find3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/find3.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/find3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/lower_bound1.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/lower_bound1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/lower_bound2.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/lower_bound2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/lower_bound3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/lower_bound3.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/lower_bound3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/upper_bound1.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/upper_bound1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/upper_bound2.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/upper_bound2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp b/libcxx/test/std/containers/associative/map/map.ops/upper_bound3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/map/map.ops/upper_bound3.fail.cpp rename to libcxx/test/std/containers/associative/map/map.ops/upper_bound3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/associative/multimap/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/associative/multimap/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.cons/compare_copy_constructible.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.cons/compare_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.cons/compare_copy_constructible.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.cons/compare_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/count1.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/count1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/count2.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/count2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/count3.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/count3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/equal_range3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/find1.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/find1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/find2.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/find2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/find3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/find3.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/find3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/lower_bound3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound1.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound2.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp b/libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.fail.cpp rename to libcxx/test/std/containers/associative/multimap/multimap.ops/upper_bound3.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multiset/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/associative/multiset/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multiset/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/associative/multiset/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/multiset/multiset.cons/compare_copy_constructible.fail.cpp b/libcxx/test/std/containers/associative/multiset/multiset.cons/compare_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/multiset/multiset.cons/compare_copy_constructible.fail.cpp rename to libcxx/test/std/containers/associative/multiset/multiset.cons/compare_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/set/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/associative/set/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/set/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/associative/set/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/associative/set/set.cons/compare_copy_constructible.fail.cpp b/libcxx/test/std/containers/associative/set/set.cons/compare_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/associative/set/set.cons/compare_copy_constructible.fail.cpp rename to libcxx/test/std/containers/associative/set/set.cons/compare_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/container.adaptors/priority.queue/types.fail.cpp b/libcxx/test/std/containers/container.adaptors/priority.queue/types.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/container.adaptors/priority.queue/types.fail.cpp rename to libcxx/test/std/containers/container.adaptors/priority.queue/types.compile.fail.cpp diff --git a/libcxx/test/std/containers/container.adaptors/queue/queue.defn/types.fail.cpp b/libcxx/test/std/containers/container.adaptors/queue/queue.defn/types.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/container.adaptors/queue/queue.defn/types.fail.cpp rename to libcxx/test/std/containers/container.adaptors/queue/queue.defn/types.compile.fail.cpp diff --git a/libcxx/test/std/containers/container.adaptors/stack/stack.defn/types.fail.cpp b/libcxx/test/std/containers/container.adaptors/stack/stack.defn/types.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/container.adaptors/stack/stack.defn/types.fail.cpp rename to libcxx/test/std/containers/container.adaptors/stack/stack.defn/types.compile.fail.cpp diff --git a/libcxx/test/std/containers/sequences/deque/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/sequences/deque/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/sequences/deque/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/sequences/deque/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/sequences/forwardlist/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/sequences/forwardlist/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/sequences/forwardlist/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/sequences/forwardlist/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp b/libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.fail.cpp rename to libcxx/test/std/containers/sequences/forwardlist/forwardlist.cons/alloc.compile.fail.cpp diff --git a/libcxx/test/std/containers/sequences/list/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/sequences/list/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/sequences/list/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/sequences/list/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/sequences/vector/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/sequences/vector/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/sequences/vector/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/sequences/vector/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.map/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/unord/unord.map/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.map/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/unord/unord.map/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/compare_copy_constructible.fail.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/compare_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/compare_copy_constructible.fail.cpp rename to libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/compare_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/hash_copy_constructible.fail.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/hash_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/hash_copy_constructible.fail.cpp rename to libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/hash_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp b/libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/size.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/size.fail.cpp rename to libcxx/test/std/containers/unord/unord.map/unord.map.cnstr/size.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multimap/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/unord/unord.multimap/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multimap/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/unord/unord.multimap/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multimap/iterators.fail.cpp b/libcxx/test/std/containers/unord/unord.multimap/iterators.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multimap/iterators.fail.cpp rename to libcxx/test/std/containers/unord/unord.multimap/iterators.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multimap/local_iterators.fail.cpp b/libcxx/test/std/containers/unord/unord.multimap/local_iterators.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multimap/local_iterators.fail.cpp rename to libcxx/test/std/containers/unord/unord.multimap/local_iterators.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/compare_copy_constructible.fail.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/compare_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/compare_copy_constructible.fail.cpp rename to libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/compare_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/hash_copy_constructible.fail.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/hash_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/hash_copy_constructible.fail.cpp rename to libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/hash_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp b/libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.fail.cpp rename to libcxx/test/std/containers/unord/unord.multimap/unord.multimap.cnstr/size.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multiset/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/unord/unord.multiset/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multiset/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/unord/unord.multiset/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multiset/iterators.fail.cpp b/libcxx/test/std/containers/unord/unord.multiset/iterators.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multiset/iterators.fail.cpp rename to libcxx/test/std/containers/unord/unord.multiset/iterators.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multiset/local_iterators.fail.cpp b/libcxx/test/std/containers/unord/unord.multiset/local_iterators.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multiset/local_iterators.fail.cpp rename to libcxx/test/std/containers/unord/unord.multiset/local_iterators.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/compare_copy_constructible.fail.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/compare_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/compare_copy_constructible.fail.cpp rename to libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/compare_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/hash_copy_constructible.fail.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/hash_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/hash_copy_constructible.fail.cpp rename to libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/hash_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp b/libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.fail.cpp rename to libcxx/test/std/containers/unord/unord.multiset/unord.multiset.cnstr/size.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.set/allocator_mismatch.fail.cpp b/libcxx/test/std/containers/unord/unord.set/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.set/allocator_mismatch.fail.cpp rename to libcxx/test/std/containers/unord/unord.set/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.set/iterators.fail.cpp b/libcxx/test/std/containers/unord/unord.set/iterators.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.set/iterators.fail.cpp rename to libcxx/test/std/containers/unord/unord.set/iterators.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.set/local_iterators.fail.cpp b/libcxx/test/std/containers/unord/unord.set/local_iterators.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.set/local_iterators.fail.cpp rename to libcxx/test/std/containers/unord/unord.set/local_iterators.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/compare_copy_constructible.fail.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/compare_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/compare_copy_constructible.fail.cpp rename to libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/compare_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/hash_copy_constructible.fail.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/hash_copy_constructible.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/hash_copy_constructible.fail.cpp rename to libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/hash_copy_constructible.compile.fail.cpp diff --git a/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp b/libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/size.compile.fail.cpp similarity index 100% rename from libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/size.fail.cpp rename to libcxx/test/std/containers/unord/unord.set/unord.set.cnstr/size.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.fail.cpp b/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.fail.cpp rename to libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/assignment.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.fail.cpp b/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.fail.cpp rename to libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.fail.cpp b/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.fail.cpp rename to libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/convert_assignment.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.fail.cpp b/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.fail.cpp rename to libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/copy.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/explicit.fail.cpp b/libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/explicit.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/explicit.fail.cpp rename to libcxx/test/std/depr/depr.auto.ptr/auto.ptr/auto.ptr.cons/explicit.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_binary_function.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/pointer_to_unary_function.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun1.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.function.pointer.adaptors/ptr_fun2.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_ref_t.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun1_t.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref1.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_ref_t.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/const_mem_fun_t.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_ref_t.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun1_t.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref1.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_ref_t.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.cxx1z.fail.cpp b/libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.cxx1z.compile.fail.cpp similarity index 100% rename from libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.cxx1z.fail.cpp rename to libcxx/test/std/depr/depr.function.objects/depr.adaptors/depr.member.pointer.adaptors/mem_fun_t.cxx1z.compile.fail.cpp diff --git a/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool.fail.cpp b/libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool.compile.fail.cpp similarity index 100% rename from libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool.fail.cpp rename to libcxx/test/std/diagnostics/syserr/syserr.errcode/syserr.errcode.observers/bool.compile.fail.cpp diff --git a/libcxx/test/std/input.output/file.streams/c.files/gets.fail.cpp b/libcxx/test/std/input.output/file.streams/c.files/gets.compile.fail.cpp similarity index 100% rename from libcxx/test/std/input.output/file.streams/c.files/gets.fail.cpp rename to libcxx/test/std/input.output/file.streams/c.files/gets.compile.fail.cpp diff --git a/libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_char.fail.cpp b/libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_char.compile.fail.cpp similarity index 100% rename from libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_char.fail.cpp rename to libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_char.compile.fail.cpp diff --git a/libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_traits.fail.cpp b/libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_traits.compile.fail.cpp similarity index 100% rename from libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_traits.fail.cpp rename to libcxx/test/std/input.output/iostream.format/quoted.manip/quoted_traits.compile.fail.cpp diff --git a/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.fail.cpp b/libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.compile.fail.cpp similarity index 100% rename from libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.fail.cpp rename to libcxx/test/std/input.output/stream.buffers/streambuf/streambuf.cons/default.compile.fail.cpp diff --git a/libcxx/test/std/iterators/iterator.range/begin-end.fail.cpp b/libcxx/test/std/iterators/iterator.range/begin-end.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/iterator.range/begin-end.fail.cpp rename to libcxx/test/std/iterators/iterator.range/begin-end.compile.fail.cpp diff --git a/libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.fail.cpp b/libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.fail.cpp rename to libcxx/test/std/iterators/predef.iterators/insert.iterators/back.insert.iter.ops/back.insert.iter.cons/container.compile.fail.cpp diff --git a/libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.fail.cpp b/libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.fail.cpp rename to libcxx/test/std/iterators/predef.iterators/insert.iterators/front.insert.iter.ops/front.insert.iter.cons/container.compile.fail.cpp diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.fail.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.fail.cpp rename to libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/convert.compile.fail.cpp diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.fail.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.fail.cpp rename to libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op.const/iter.compile.fail.cpp diff --git a/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.fail.cpp b/libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.fail.cpp rename to libcxx/test/std/iterators/predef.iterators/move.iterators/move.iter.ops/move.iter.op=/move_iterator.compile.fail.cpp diff --git a/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.fail.cpp b/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.fail.cpp rename to libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/iter.compile.fail.cpp diff --git a/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.fail.cpp b/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.fail.cpp rename to libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.cons/reverse_iterator.compile.fail.cpp diff --git a/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.fail.cpp b/libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.fail.cpp rename to libcxx/test/std/iterators/predef.iterators/reverse.iterators/reverse.iter.ops/reverse.iter.op=/reverse_iterator.compile.fail.cpp diff --git a/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp b/libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.compile.fail.cpp similarity index 100% rename from libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.fail.cpp rename to libcxx/test/std/iterators/stream.iterators/istream.iterator/istream.iterator.cons/default.compile.fail.cpp diff --git a/libcxx/test/std/language.support/support.start.term/quick_exit_check1.fail.cpp b/libcxx/test/std/language.support/support.start.term/quick_exit_check1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/language.support/support.start.term/quick_exit_check1.fail.cpp rename to libcxx/test/std/language.support/support.start.term/quick_exit_check1.compile.fail.cpp diff --git a/libcxx/test/std/language.support/support.start.term/quick_exit_check2.fail.cpp b/libcxx/test/std/language.support/support.start.term/quick_exit_check2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/language.support/support.start.term/quick_exit_check2.fail.cpp rename to libcxx/test/std/language.support/support.start.term/quick_exit_check2.compile.fail.cpp diff --git a/libcxx/test/std/language.support/support.types/byteops/lshift.assign.fail.cpp b/libcxx/test/std/language.support/support.types/byteops/lshift.assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/language.support/support.types/byteops/lshift.assign.fail.cpp rename to libcxx/test/std/language.support/support.types/byteops/lshift.assign.compile.fail.cpp diff --git a/libcxx/test/std/language.support/support.types/byteops/lshift.fail.cpp b/libcxx/test/std/language.support/support.types/byteops/lshift.compile.fail.cpp similarity index 100% rename from libcxx/test/std/language.support/support.types/byteops/lshift.fail.cpp rename to libcxx/test/std/language.support/support.types/byteops/lshift.compile.fail.cpp diff --git a/libcxx/test/std/language.support/support.types/byteops/rshift.assign.fail.cpp b/libcxx/test/std/language.support/support.types/byteops/rshift.assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/language.support/support.types/byteops/rshift.assign.fail.cpp rename to libcxx/test/std/language.support/support.types/byteops/rshift.assign.compile.fail.cpp diff --git a/libcxx/test/std/language.support/support.types/byteops/rshift.fail.cpp b/libcxx/test/std/language.support/support.types/byteops/rshift.compile.fail.cpp similarity index 100% rename from libcxx/test/std/language.support/support.types/byteops/rshift.fail.cpp rename to libcxx/test/std/language.support/support.types/byteops/rshift.compile.fail.cpp diff --git a/libcxx/test/std/language.support/support.types/byteops/to_integer.fail.cpp b/libcxx/test/std/language.support/support.types/byteops/to_integer.compile.fail.cpp similarity index 100% rename from libcxx/test/std/language.support/support.types/byteops/to_integer.fail.cpp rename to libcxx/test/std/language.support/support.types/byteops/to_integer.compile.fail.cpp diff --git a/libcxx/test/std/language.support/support.types/nullptr_t_integral_cast.fail.cpp b/libcxx/test/std/language.support/support.types/nullptr_t_integral_cast.compile.fail.cpp similarity index 100% rename from libcxx/test/std/language.support/support.types/nullptr_t_integral_cast.fail.cpp rename to libcxx/test/std/language.support/support.types/nullptr_t_integral_cast.compile.fail.cpp diff --git a/libcxx/test/std/numerics/complex.number/complex.literals/literals1.fail.cpp b/libcxx/test/std/numerics/complex.number/complex.literals/literals1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/complex.number/complex.literals/literals1.fail.cpp rename to libcxx/test/std/numerics/complex.number/complex.literals/literals1.compile.fail.cpp diff --git a/libcxx/test/std/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp b/libcxx/test/std/numerics/complex.number/complex.special/double_long_double_implicit.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/complex.number/complex.special/double_long_double_implicit.fail.cpp rename to libcxx/test/std/numerics/complex.number/complex.special/double_long_double_implicit.compile.fail.cpp diff --git a/libcxx/test/std/numerics/complex.number/complex.special/float_double_implicit.fail.cpp b/libcxx/test/std/numerics/complex.number/complex.special/float_double_implicit.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/complex.number/complex.special/float_double_implicit.fail.cpp rename to libcxx/test/std/numerics/complex.number/complex.special/float_double_implicit.compile.fail.cpp diff --git a/libcxx/test/std/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp b/libcxx/test/std/numerics/complex.number/complex.special/float_long_double_implicit.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/complex.number/complex.special/float_long_double_implicit.fail.cpp rename to libcxx/test/std/numerics/complex.number/complex.special/float_long_double_implicit.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numarray/template.gslice.array/default.fail.cpp b/libcxx/test/std/numerics/numarray/template.gslice.array/default.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numarray/template.gslice.array/default.fail.cpp rename to libcxx/test/std/numerics/numarray/template.gslice.array/default.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numarray/template.indirect.array/default.fail.cpp b/libcxx/test/std/numerics/numarray/template.indirect.array/default.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numarray/template.indirect.array/default.fail.cpp rename to libcxx/test/std/numerics/numarray/template.indirect.array/default.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numarray/template.mask.array/default.fail.cpp b/libcxx/test/std/numerics/numarray/template.mask.array/default.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numarray/template.mask.array/default.fail.cpp rename to libcxx/test/std/numerics/numarray/template.mask.array/default.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numarray/template.slice.array/default.fail.cpp b/libcxx/test/std/numerics/numarray/template.slice.array/default.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numarray/template.slice.array/default.fail.cpp rename to libcxx/test/std/numerics/numarray/template.slice.array/default.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool1.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool1.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool1.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool2.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool2.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool2.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool3.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool3.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool3.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool4.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool4.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool4.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.bool4.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral1.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral1.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral1.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral2.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral2.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.gcd/gcd.not_integral2.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool1.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool1.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool1.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool2.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool2.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool2.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool3.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool3.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool3.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool4.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool4.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool4.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.bool4.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral1.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral1.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral1.compile.fail.cpp diff --git a/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral2.fail.cpp b/libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral2.fail.cpp rename to libcxx/test/std/numerics/numeric.ops/numeric.ops.lcm/lcm.not_integral2.compile.fail.cpp diff --git a/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/assign.fail.cpp b/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/assign.fail.cpp rename to libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/assign.compile.fail.cpp diff --git a/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/copy.fail.cpp b/libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/copy.fail.cpp rename to libcxx/test/std/numerics/rand/rand.util/rand.util.seedseq/copy.compile.fail.cpp diff --git a/libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp b/libcxx/test/std/re/re.alg/re.alg.match/basic.compile.fail.cpp similarity index 100% rename from libcxx/test/std/re/re.alg/re.alg.match/basic.fail.cpp rename to libcxx/test/std/re/re.alg/re.alg.match/basic.compile.fail.cpp diff --git a/libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp b/libcxx/test/std/re/re.alg/re.alg.search/basic.compile.fail.cpp similarity index 100% rename from libcxx/test/std/re/re.alg/re.alg.search/basic.fail.cpp rename to libcxx/test/std/re/re.alg/re.alg.search/basic.compile.fail.cpp diff --git a/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp b/libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.compile.fail.cpp similarity index 100% rename from libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.fail.cpp rename to libcxx/test/std/re/re.iter/re.regiter/re.regiter.cnstr/cnstr.compile.fail.cpp diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.compile.fail.cpp similarity index 100% rename from libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.fail.cpp rename to libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/array.compile.fail.cpp diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.compile.fail.cpp similarity index 100% rename from libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.fail.cpp rename to libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/init.compile.fail.cpp diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.compile.fail.cpp similarity index 100% rename from libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.fail.cpp rename to libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/int.compile.fail.cpp diff --git a/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp b/libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.compile.fail.cpp similarity index 100% rename from libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.fail.cpp rename to libcxx/test/std/re/re.iter/re.tokiter/re.tokiter.cnstr/vector.compile.fail.cpp diff --git a/libcxx/test/std/strings/basic.string.literals/literal1.fail.cpp b/libcxx/test/std/strings/basic.string.literals/literal1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/basic.string.literals/literal1.fail.cpp rename to libcxx/test/std/strings/basic.string.literals/literal1.compile.fail.cpp diff --git a/libcxx/test/std/strings/basic.string.literals/literal2.fail.cpp b/libcxx/test/std/strings/basic.string.literals/literal2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/basic.string.literals/literal2.fail.cpp rename to libcxx/test/std/strings/basic.string.literals/literal2.compile.fail.cpp diff --git a/libcxx/test/std/strings/basic.string/allocator_mismatch.fail.cpp b/libcxx/test/std/strings/basic.string/allocator_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/basic.string/allocator_mismatch.fail.cpp rename to libcxx/test/std/strings/basic.string/allocator_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/strings/basic.string/string.cons/string_view.fail.cpp b/libcxx/test/std/strings/basic.string/string.cons/string_view.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/basic.string/string.cons/string_view.fail.cpp rename to libcxx/test/std/strings/basic.string/string.cons/string_view.compile.fail.cpp diff --git a/libcxx/test/std/strings/basic.string/traits_mismatch.fail.cpp b/libcxx/test/std/strings/basic.string/traits_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/basic.string/traits_mismatch.fail.cpp rename to libcxx/test/std/strings/basic.string/traits_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/strings/string.view/string.view.cons/from_string1.fail.cpp b/libcxx/test/std/strings/string.view/string.view.cons/from_string1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/string.view/string.view.cons/from_string1.fail.cpp rename to libcxx/test/std/strings/string.view/string.view.cons/from_string1.compile.fail.cpp diff --git a/libcxx/test/std/strings/string.view/string.view.cons/from_string2.fail.cpp b/libcxx/test/std/strings/string.view/string.view.cons/from_string2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/string.view/string.view.cons/from_string2.fail.cpp rename to libcxx/test/std/strings/string.view/string.view.cons/from_string2.compile.fail.cpp diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal1.fail.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/string.view/string_view.literals/literal1.fail.cpp rename to libcxx/test/std/strings/string.view/string_view.literals/literal1.compile.fail.cpp diff --git a/libcxx/test/std/strings/string.view/string_view.literals/literal2.fail.cpp b/libcxx/test/std/strings/string.view/string_view.literals/literal2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/string.view/string_view.literals/literal2.fail.cpp rename to libcxx/test/std/strings/string.view/string_view.literals/literal2.compile.fail.cpp diff --git a/libcxx/test/std/strings/string.view/traits_mismatch.fail.cpp b/libcxx/test/std/strings/string.view/traits_mismatch.compile.fail.cpp similarity index 100% rename from libcxx/test/std/strings/string.view/traits_mismatch.fail.cpp rename to libcxx/test/std/strings/string.view/traits_mismatch.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvar/assign.fail.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.condition/thread.condition.condvar/assign.fail.cpp rename to libcxx/test/std/thread/thread.condition/thread.condition.condvar/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvar/copy.fail.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvar/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.condition/thread.condition.condvar/copy.fail.cpp rename to libcxx/test/std/thread/thread.condition/thread.condition.condvar/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/assign.fail.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.condition/thread.condition.condvarany/assign.fail.cpp rename to libcxx/test/std/thread/thread.condition/thread.condition.condvarany/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/copy.fail.cpp b/libcxx/test/std/thread/thread.condition/thread.condition.condvarany/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.condition/thread.condition.condvarany/copy.fail.cpp rename to libcxx/test/std/thread/thread.condition/thread.condition.condvarany/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.guard/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_ctor.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_ctor.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_ctor.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.shared/thread.lock.shared.cons/copy_ctor.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_ctor.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_ctor.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_ctor.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.lock/thread.lock.unique/thread.lock.unique.cons/copy_ctor.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.class/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.mutex.requirements.mutex/thread.mutex.recursive/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.sharedtimedmutex.requirements/thread.sharedtimedmutex.class/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.class/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.mutex.requirements/thread.timedmutex.requirements/thread.timedmutex.recursive/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.once/thread.once.onceflag/assign.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.once/thread.once.onceflag/assign.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.once/thread.once.onceflag/assign.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.once/thread.once.onceflag/assign.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.mutex/thread.once/thread.once.onceflag/copy.fail.cpp b/libcxx/test/std/thread/thread.mutex/thread.once/thread.once.onceflag/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.mutex/thread.once/thread.once.onceflag/copy.fail.cpp rename to libcxx/test/std/thread/thread.mutex/thread.once/thread.once.onceflag/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp b/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.fail.cpp rename to libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.assign/copy.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/constr.fail.cpp b/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/constr.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/constr.fail.cpp rename to libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/constr.compile.fail.cpp diff --git a/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.fail.cpp b/libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.fail.cpp rename to libcxx/test/std/thread/thread.threads/thread.thread.class/thread.thread.constr/copy.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.memfn/member_data.fail.cpp b/libcxx/test/std/utilities/function.objects/func.memfn/member_data.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.memfn/member_data.fail.cpp rename to libcxx/test/std/utilities/function.objects/func.memfn/member_data.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.fail.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.fail.cpp rename to libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/derive_from.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.fail.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.fail.cpp rename to libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.fail.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.fail.cpp rename to libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_F.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.fail.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.fail.cpp rename to libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_function.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.fail.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.fail.cpp rename to libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_nullptr.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.fail.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.fail.cpp rename to libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.con/alloc_rfunction.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.fail.cpp b/libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.fail.cpp rename to libcxx/test/std/utilities/function.objects/func.wrap/func.wrap.func/func.wrap.func.inv/invoke.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.fail.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.fail.cpp rename to libcxx/test/std/utilities/function.objects/refwrap/refwrap.const/type_ctor.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.fail.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.fail.cpp rename to libcxx/test/std/utilities/function.objects/refwrap/refwrap.helpers/ref_1.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.fail.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.fail.cpp rename to libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.incomplete.fail.cpp b/libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.incomplete.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.incomplete.fail.cpp rename to libcxx/test/std/utilities/function.objects/refwrap/refwrap.invoke/invoke.incomplete.compile.fail.cpp diff --git a/libcxx/test/std/utilities/function.objects/unord.hash/enum.fail.cpp b/libcxx/test/std/utilities/function.objects/unord.hash/enum.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/function.objects/unord.hash/enum.fail.cpp rename to libcxx/test/std/utilities/function.objects/unord.hash/enum.compile.fail.cpp diff --git a/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp b/libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.fail.cpp rename to libcxx/test/std/utilities/intseq/intseq.intseq/integer_seq.compile.fail.cpp diff --git a/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.fail.cpp b/libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.fail.cpp rename to libcxx/test/std/utilities/intseq/intseq.make/make_integer_seq_fallback.compile.fail.cpp diff --git a/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.temp.fail.cpp b/libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.temp.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.temp.fail.cpp rename to libcxx/test/std/utilities/memory/specialized.algorithms/specialized.addressof/addressof.temp.compile.fail.cpp diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.fail.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.fail.cpp rename to libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.shared/util.smartptr.shared.create/make_shared.private.compile.fail.cpp diff --git a/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.fail.cpp b/libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.fail.cpp rename to libcxx/test/std/utilities/memory/util.smartptr/util.smartptr.weak/util.smartptr.weak.obs/not_less_than.compile.fail.cpp diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.fail.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.fail.cpp rename to libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/aligned_union.compile.fail.cpp diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.fail.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.fail.cpp rename to libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if.compile.fail.cpp diff --git a/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if2.fail.cpp b/libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if2.fail.cpp rename to libcxx/test/std/utilities/meta/meta.trans/meta.trans.other/enable_if2.compile.fail.cpp diff --git a/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp b/libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.fail.cpp rename to libcxx/test/std/utilities/optional/optional.nullopt/nullopt_t.compile.fail.cpp diff --git a/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.fail.cpp b/libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.fail.cpp rename to libcxx/test/std/utilities/optional/optional.object/optional.object.observe/value_const.compile.fail.cpp diff --git a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.fail.cpp b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.fail.cpp rename to libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_add.compile.fail.cpp diff --git a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.fail.cpp b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.fail.cpp rename to libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_divide.compile.fail.cpp diff --git a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.fail.cpp b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.fail.cpp rename to libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_multiply.compile.fail.cpp diff --git a/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.fail.cpp b/libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.fail.cpp rename to libcxx/test/std/utilities/ratio/ratio.arithmetic/ratio_subtract.compile.fail.cpp diff --git a/libcxx/test/std/utilities/ratio/ratio.ratio/ratio1.fail.cpp b/libcxx/test/std/utilities/ratio/ratio.ratio/ratio1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/ratio/ratio.ratio/ratio1.fail.cpp rename to libcxx/test/std/utilities/ratio/ratio.ratio/ratio1.compile.fail.cpp diff --git a/libcxx/test/std/utilities/ratio/ratio.ratio/ratio2.fail.cpp b/libcxx/test/std/utilities/ratio/ratio.ratio/ratio2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/ratio/ratio.ratio/ratio2.fail.cpp rename to libcxx/test/std/utilities/ratio/ratio.ratio/ratio2.compile.fail.cpp diff --git a/libcxx/test/std/utilities/ratio/ratio.ratio/ratio3.fail.cpp b/libcxx/test/std/utilities/ratio/ratio.ratio/ratio3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/ratio/ratio.ratio/ratio3.fail.cpp rename to libcxx/test/std/utilities/ratio/ratio.ratio/ratio3.compile.fail.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array1.compile.fail.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array2.compile.fail.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array3.compile.fail.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.create/make_unique.array4.compile.fail.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/incomplete.compile.fail.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt/void.compile.fail.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/convert_ctor.compile.fail.cpp diff --git a/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.fail.cpp b/libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.fail.cpp rename to libcxx/test/std/utilities/smartptr/unique.ptr/unique.ptr.dltr/unique.ptr.dltr.dflt1/incomplete.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/duration.fail.cpp b/libcxx/test/std/utilities/time/time.duration/duration.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/duration.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/duration.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/positive_num.fail.cpp b/libcxx/test/std/utilities/time/time.duration/positive_num.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/positive_num.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/positive_num.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/ratio.fail.cpp b/libcxx/test/std/utilities/time/time.duration/ratio.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/ratio.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/ratio.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.alg/abs.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cast/ceil.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cast/floor.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cast/round.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cast/toduration.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cast/toduration.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cast/toduration.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cast/toduration.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_float_to_int.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_float_to_int.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_float_to_int.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_float_to_int.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cons/convert_inexact.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep01.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep01.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep01.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep01.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep02.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep03.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep03.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep03.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.cons/rep03.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals1.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.literals/literals2.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_divide_rep.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_mod_rep.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep1.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.fail.cpp b/libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.fail.cpp rename to libcxx/test/std/utilities/time/time.duration/time.duration.nonmember/op_times_rep2.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/duration.fail.cpp b/libcxx/test/std/utilities/time/time.point/duration.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/duration.fail.cpp rename to libcxx/test/std/utilities/time/time.point/duration.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.fail.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.fail.cpp rename to libcxx/test/std/utilities/time/time.point/time.point.cast/ceil.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/floor.fail.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cast/floor.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/time.point.cast/floor.fail.cpp rename to libcxx/test/std/utilities/time/time.point/time.point.cast/floor.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/round.fail.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cast/round.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/time.point.cast/round.fail.cpp rename to libcxx/test/std/utilities/time/time.point/time.point.cast/round.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cast/toduration.fail.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cast/toduration.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/time.point.cast/toduration.fail.cpp rename to libcxx/test/std/utilities/time/time.point/time.point.cast/toduration.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.fail.cpp b/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.fail.cpp rename to libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_equal.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.fail.cpp b/libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.fail.cpp rename to libcxx/test/std/utilities/time/time.point/time.point.comparisons/op_less.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/convert.fail.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cons/convert.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/time.point.cons/convert.fail.cpp rename to libcxx/test/std/utilities/time/time.point/time.point.cons/convert.compile.fail.cpp diff --git a/libcxx/test/std/utilities/time/time.point/time.point.cons/duration.fail.cpp b/libcxx/test/std/utilities/time/time.point/time.point.cons/duration.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/time/time.point/time.point.cons/duration.fail.cpp rename to libcxx/test/std/utilities/time/time.point/time.point.cons/duration.compile.fail.cpp diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.fail.cpp rename to libcxx/test/std/utilities/tuple/tuple.tuple/tuple.assign/copy.compile.fail.cpp diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.fail.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.fail.cpp rename to libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/UTypes.compile.fail.cpp diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types2.fail.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types2.fail.cpp rename to libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/const_Types2.compile.fail.cpp diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.fail.cpp rename to libcxx/test/std/utilities/tuple/tuple.tuple/tuple.cnstr/copy.compile.fail.cpp diff --git a/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.fail.cpp b/libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.fail.cpp rename to libcxx/test/std/utilities/tuple/tuple.tuple/tuple.elem/get_const.compile.fail.cpp diff --git a/libcxx/test/std/utilities/utility/as_const/as_const.fail.cpp b/libcxx/test/std/utilities/utility/as_const/as_const.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/utility/as_const/as_const.fail.cpp rename to libcxx/test/std/utilities/utility/as_const/as_const.compile.fail.cpp diff --git a/libcxx/test/std/utilities/utility/pairs/pair.astuple/get_const.fail.cpp b/libcxx/test/std/utilities/utility/pairs/pair.astuple/get_const.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/utility/pairs/pair.astuple/get_const.fail.cpp rename to libcxx/test/std/utilities/utility/pairs/pair.astuple/get_const.compile.fail.cpp diff --git a/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type1.fail.cpp b/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type1.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type1.fail.cpp rename to libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type1.compile.fail.cpp diff --git a/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type2.fail.cpp b/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type2.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type2.fail.cpp rename to libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type2.compile.fail.cpp diff --git a/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp b/libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type3.compile.fail.cpp similarity index 100% rename from libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type3.fail.cpp rename to libcxx/test/std/utilities/utility/pairs/pair.astuple/pairs.by.type3.compile.fail.cpp diff --git a/libcxx/utils/libcxx/test/newformat.py b/libcxx/utils/libcxx/test/newformat.py index 5abfde5a8d58..10c6ff325402 100644 --- a/libcxx/utils/libcxx/test/newformat.py +++ b/libcxx/utils/libcxx/test/newformat.py @@ -34,10 +34,10 @@ class CxxStandardLibraryTest(lit.formats.TestFormat): FOO.verify.cpp - Compiles with clang-verify - FOO.fail.cpp - Does not compile successfully -- run with clang-verify - if any expected-meow appears in the file, otherwise - just test that compilation fails. This is supported - only for backwards compatibility with the test suite + FOO.fail.cpp - Compiled with clang-verify if clang-verify is + supported, and equivalent to a .compile.fail.cpp + test otherwise. This is supported only for backwards + compatibility with the test suite. The test format operates by assuming that each test's configuration provides the following substitutions, which it will reuse in the shell scripts it @@ -109,25 +109,14 @@ class CxxStandardLibraryTest(lit.formats.TestFormat): for s in ['%{cxx}', '%{compile_flags}', '%{link_flags}', '%{flags}', '%{exec}']: assert s in substitutions, "Required substitution {} was not provided".format(s) - # Determine whether -verify should be used for a given test. We use -verify - # if the compiler supports it and there's at least one -verify tag in the - # source file. - # - # This is only supported for backwards compatibility with .fail.cpp tests. - def _useVerify(self, test, litConfig): - VERIFY_TAGS = (b'expected-note', b'expected-remark', - b'expected-warning', b'expected-error', - b'expected-no-diagnostics') - with open(test.getSourcePath(), 'rb') as f: - contents = f.read() - testContainsTags = any(tag in contents for tag in VERIFY_TAGS) - + # Determine whether clang-verify is supported. + def _supportsVerify(self, test, litConfig): command = "echo | %{cxx} -xc++ - -Werror -fsyntax-only -Xclang -verify-ignore-unexpected" result = lit.TestRunner.executeShTest(test, litConfig, useExternalSh=True, preamble_commands=[command]) compilerSupportsVerify = result.code != lit.Test.FAIL - return compilerSupportsVerify and testContainsTags + return compilerSupportsVerify def _disableWithModules(self, test, litConfig): with open(test.getSourcePath(), 'rb') as f: @@ -194,7 +183,7 @@ class CxxStandardLibraryTest(lit.formats.TestFormat): # otherwise it's like a .compile.fail.cpp test. This is only provided # for backwards compatibility with the test suite. elif filename.endswith('.fail.cpp'): - if self._useVerify(test, litConfig): + if self._supportsVerify(test, litConfig): steps = [ "%dbg(COMPILED WITH) %{cxx} %s %{flags} %{compile_flags} -fsyntax-only " + VERIFY_FLAGS ]