Index: libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp =================================================================== --- libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp +++ libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp @@ -40,11 +40,6 @@ #include <__config> -// Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif - int main(int, char**) { return 0; } // DO NOT MANUALLY EDIT ANYTHING BETWEEN THE MARKERS BELOW @@ -751,16 +746,4 @@ using HandlerType = decltype(std::__libcpp_verbose_abort); #endif -// RUN: %{build} -DTEST_138 -#if defined(TEST_138) -# include - using HandlerType = decltype(std::__libcpp_verbose_abort); -#endif - -// RUN: %{build} -DTEST_139 -#if defined(TEST_139) -# include - using HandlerType = decltype(std::__libcpp_verbose_abort); -#endif - // GENERATED-MARKER Index: libcxx/test/libcxx/clang_tidy.sh.cpp =================================================================== --- libcxx/test/libcxx/clang_tidy.sh.cpp +++ libcxx/test/libcxx/clang_tidy.sh.cpp @@ -15,11 +15,6 @@ // RUN: %{clang-tidy} %s --warnings-as-errors=* -header-filter=.* --checks='-*,libcpp-*' --load=%{test-tools}/clang_tidy_checks/libcxx-tidy.plugin -- %{compile_flags} -fno-modules // RUN: %{clang-tidy} %s --warnings-as-errors=* -header-filter=.* --config-file=%S/../../.clang-tidy -- -Wweak-vtables %{compile_flags} -fno-modules -// Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif - /* BEGIN-SCRIPT @@ -262,6 +257,4 @@ #if __cplusplus >= 201103L # include #endif -#include -#include // GENERATED-MARKER Index: libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp =================================================================== --- libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp +++ libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp @@ -9,9 +9,7 @@ // UNSUPPORTED: modules-build // Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif +// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated #include #include Index: libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp =================================================================== --- libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp +++ libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp @@ -16,9 +16,7 @@ struct unique_ptr; // Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif +// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated #include Index: libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp =================================================================== --- libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp +++ libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp @@ -9,9 +9,7 @@ // UNSUPPORTED: modules-build // Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif +// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated #include #include Index: libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp =================================================================== --- libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp +++ libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp @@ -16,9 +16,7 @@ struct unique_ptr; // Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif +// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated #include Index: libcxx/test/libcxx/double_include.sh.cpp =================================================================== --- libcxx/test/libcxx/double_include.sh.cpp +++ libcxx/test/libcxx/double_include.sh.cpp @@ -13,11 +13,6 @@ // RUN: %{cxx} -o %t.exe %t.first.o %t.second.o %{flags} %{link_flags} // RUN: %{run} -// Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif - /* BEGIN-SCRIPT @@ -260,8 +255,6 @@ #if __cplusplus >= 201103L # include #endif -#include -#include // GENERATED-MARKER #if defined(WITH_MAIN) Index: libcxx/test/libcxx/extensions/hash/specializations.pass.cpp =================================================================== --- libcxx/test/libcxx/extensions/hash/specializations.pass.cpp +++ libcxx/test/libcxx/extensions/hash/specializations.pass.cpp @@ -9,7 +9,7 @@ // UNSUPPORTED: modules-build // NOTE: Undefined __DEPRECATED to prevent this test from failing with -Werror -#undef __DEPRECATED +// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated #include #include #include Index: libcxx/test/libcxx/min_max_macros.compile.pass.cpp =================================================================== --- libcxx/test/libcxx/min_max_macros.compile.pass.cpp +++ libcxx/test/libcxx/min_max_macros.compile.pass.cpp @@ -9,11 +9,6 @@ // Test that headers are not tripped up by the surrounding code defining the // min() and max() macros. -// Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif - #define TEST_MACROS() static_assert(min() == true && max() == true, "") #define min() true #define max() true @@ -398,8 +393,4 @@ # include TEST_MACROS(); #endif -#include -TEST_MACROS(); -#include -TEST_MACROS(); // GENERATED-MARKER Index: libcxx/test/libcxx/modules_include.sh.cpp =================================================================== --- libcxx/test/libcxx/modules_include.sh.cpp +++ libcxx/test/libcxx/modules_include.sh.cpp @@ -20,11 +20,6 @@ // The Android headers don't appear to be compatible with modules yet // XFAIL: LIBCXX-ANDROID-FIXME -// Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif - #include <__config> /* @@ -868,18 +863,8 @@ #if defined(TEST_137) && __cplusplus >= 201103L #include #endif -// RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_138 &' >> %t.sh -// RUN: echo 'TEST_138=$!' >> %t.sh // RUN: echo "wait $TEST_122" >> %t.sh -#if defined(TEST_138) -#include -#endif -// RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_139 &' >> %t.sh -// RUN: echo 'TEST_139=$!' >> %t.sh // RUN: echo "wait $TEST_123" >> %t.sh -#if defined(TEST_139) -#include -#endif // RUN: echo "wait $TEST_124" >> %t.sh // RUN: echo "wait $TEST_125" >> %t.sh // RUN: echo "wait $TEST_126" >> %t.sh @@ -894,7 +879,5 @@ // RUN: echo "wait $TEST_135" >> %t.sh // RUN: echo "wait $TEST_136" >> %t.sh // RUN: echo "wait $TEST_137" >> %t.sh -// RUN: echo "wait $TEST_138" >> %t.sh -// RUN: echo "wait $TEST_139" >> %t.sh // RUN: bash %t.sh // GENERATED-MARKER Index: libcxx/test/libcxx/nasty_macros.compile.pass.cpp =================================================================== --- libcxx/test/libcxx/nasty_macros.compile.pass.cpp +++ libcxx/test/libcxx/nasty_macros.compile.pass.cpp @@ -9,11 +9,6 @@ // Test that headers are not tripped up by the surrounding code defining various // alphabetic macros. -// Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif - #define NASTY_MACRO This should not be expanded!!! // libc++ does not use single-letter names as a matter of principle. @@ -384,6 +379,4 @@ #if __cplusplus >= 201103L # include #endif -#include -#include // GENERATED-MARKER Index: libcxx/test/libcxx/no_assert_include.compile.pass.cpp =================================================================== --- libcxx/test/libcxx/no_assert_include.compile.pass.cpp +++ libcxx/test/libcxx/no_assert_include.compile.pass.cpp @@ -9,11 +9,6 @@ // Ensure that none of the standard C++ headers implicitly include cassert or // assert.h (because assert() is implemented as a macro). -// Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif - /* BEGIN-SCRIPT @@ -257,8 +252,6 @@ #if __cplusplus >= 201103L # include #endif -#include -#include // GENERATED-MARKER #ifdef assert Index: libcxx/test/libcxx/transitive_includes.sh.cpp =================================================================== --- libcxx/test/libcxx/transitive_includes.sh.cpp +++ libcxx/test/libcxx/transitive_includes.sh.cpp @@ -32,11 +32,6 @@ // this test instead. // UNSUPPORTED: transitive-includes-disabled -// Prevent from generating deprecated warnings for this test. -#if defined(__DEPRECATED) -# undef __DEPRECATED -#endif - /* BEGIN-SCRIPT @@ -542,14 +537,6 @@ #if defined(TEST_137) #include #endif -// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes --preprocess -DTEST_138 > /dev/null 2> %t/header.ext_hash_map -#if defined(TEST_138) -#include -#endif -// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes --preprocess -DTEST_139 > /dev/null 2> %t/header.ext_hash_set -#if defined(TEST_139) -#include -#endif // RUN: %{python} %S/transitive_includes_to_csv.py %t > %t/transitive_includes.csv // RUN: diff -w %S/transitive_includes/%{cxx_std}.csv %t/transitive_includes.csv // GENERATED-MARKER Index: libcxx/test/libcxx/transitive_includes/cxx03.csv =================================================================== --- libcxx/test/libcxx/transitive_includes/cxx03.csv +++ libcxx/test/libcxx/transitive_includes/cxx03.csv @@ -276,33 +276,6 @@ experimental/utility utility experimental/vector experimental/memory_resource experimental/vector vector -ext/hash_map algorithm -ext/hash_map cmath -ext/hash_map concepts -ext/hash_map cstddef -ext/hash_map cstdint -ext/hash_map cstring -ext/hash_map functional -ext/hash_map initializer_list -ext/hash_map iterator -ext/hash_map limits -ext/hash_map new -ext/hash_map stdexcept -ext/hash_map string -ext/hash_map type_traits -ext/hash_set algorithm -ext/hash_set cmath -ext/hash_set concepts -ext/hash_set cstddef -ext/hash_set cstdint -ext/hash_set cstring -ext/hash_set functional -ext/hash_set initializer_list -ext/hash_set iterator -ext/hash_set limits -ext/hash_set new -ext/hash_set string -ext/hash_set type_traits filesystem compare filesystem concepts filesystem cstddef Index: libcxx/test/libcxx/transitive_includes/cxx11.csv =================================================================== --- libcxx/test/libcxx/transitive_includes/cxx11.csv +++ libcxx/test/libcxx/transitive_includes/cxx11.csv @@ -276,33 +276,6 @@ experimental/utility utility experimental/vector experimental/memory_resource experimental/vector vector -ext/hash_map algorithm -ext/hash_map cmath -ext/hash_map concepts -ext/hash_map cstddef -ext/hash_map cstdint -ext/hash_map cstring -ext/hash_map functional -ext/hash_map initializer_list -ext/hash_map iterator -ext/hash_map limits -ext/hash_map new -ext/hash_map stdexcept -ext/hash_map string -ext/hash_map type_traits -ext/hash_set algorithm -ext/hash_set cmath -ext/hash_set concepts -ext/hash_set cstddef -ext/hash_set cstdint -ext/hash_set cstring -ext/hash_set functional -ext/hash_set initializer_list -ext/hash_set iterator -ext/hash_set limits -ext/hash_set new -ext/hash_set string -ext/hash_set type_traits filesystem compare filesystem concepts filesystem cstddef Index: libcxx/test/libcxx/transitive_includes/cxx14.csv =================================================================== --- libcxx/test/libcxx/transitive_includes/cxx14.csv +++ libcxx/test/libcxx/transitive_includes/cxx14.csv @@ -278,33 +278,6 @@ experimental/utility utility experimental/vector experimental/memory_resource experimental/vector vector -ext/hash_map algorithm -ext/hash_map cmath -ext/hash_map concepts -ext/hash_map cstddef -ext/hash_map cstdint -ext/hash_map cstring -ext/hash_map functional -ext/hash_map initializer_list -ext/hash_map iterator -ext/hash_map limits -ext/hash_map new -ext/hash_map stdexcept -ext/hash_map string -ext/hash_map type_traits -ext/hash_set algorithm -ext/hash_set cmath -ext/hash_set concepts -ext/hash_set cstddef -ext/hash_set cstdint -ext/hash_set cstring -ext/hash_set functional -ext/hash_set initializer_list -ext/hash_set iterator -ext/hash_set limits -ext/hash_set new -ext/hash_set string -ext/hash_set type_traits filesystem compare filesystem concepts filesystem cstddef Index: libcxx/test/libcxx/transitive_includes/cxx17.csv =================================================================== --- libcxx/test/libcxx/transitive_includes/cxx17.csv +++ libcxx/test/libcxx/transitive_includes/cxx17.csv @@ -278,33 +278,6 @@ experimental/utility utility experimental/vector experimental/memory_resource experimental/vector vector -ext/hash_map algorithm -ext/hash_map cmath -ext/hash_map concepts -ext/hash_map cstddef -ext/hash_map cstdint -ext/hash_map cstring -ext/hash_map functional -ext/hash_map initializer_list -ext/hash_map iterator -ext/hash_map limits -ext/hash_map new -ext/hash_map stdexcept -ext/hash_map string -ext/hash_map type_traits -ext/hash_set algorithm -ext/hash_set cmath -ext/hash_set concepts -ext/hash_set cstddef -ext/hash_set cstdint -ext/hash_set cstring -ext/hash_set functional -ext/hash_set initializer_list -ext/hash_set iterator -ext/hash_set limits -ext/hash_set new -ext/hash_set string -ext/hash_set type_traits filesystem compare filesystem concepts filesystem cstddef Index: libcxx/test/libcxx/transitive_includes/cxx20.csv =================================================================== --- libcxx/test/libcxx/transitive_includes/cxx20.csv +++ libcxx/test/libcxx/transitive_includes/cxx20.csv @@ -285,33 +285,6 @@ experimental/utility utility experimental/vector experimental/memory_resource experimental/vector vector -ext/hash_map algorithm -ext/hash_map cmath -ext/hash_map concepts -ext/hash_map cstddef -ext/hash_map cstdint -ext/hash_map cstring -ext/hash_map functional -ext/hash_map initializer_list -ext/hash_map iterator -ext/hash_map limits -ext/hash_map new -ext/hash_map stdexcept -ext/hash_map string -ext/hash_map type_traits -ext/hash_set algorithm -ext/hash_set cmath -ext/hash_set concepts -ext/hash_set cstddef -ext/hash_set cstdint -ext/hash_set cstring -ext/hash_set functional -ext/hash_set initializer_list -ext/hash_set iterator -ext/hash_set limits -ext/hash_set new -ext/hash_set string -ext/hash_set type_traits filesystem compare filesystem concepts filesystem cstddef Index: libcxx/test/libcxx/transitive_includes/cxx2b.csv =================================================================== --- libcxx/test/libcxx/transitive_includes/cxx2b.csv +++ libcxx/test/libcxx/transitive_includes/cxx2b.csv @@ -184,27 +184,6 @@ experimental/utility utility experimental/vector experimental/memory_resource experimental/vector vector -ext/hash_map algorithm -ext/hash_map cmath -ext/hash_map cstddef -ext/hash_map cstdint -ext/hash_map cstring -ext/hash_map functional -ext/hash_map initializer_list -ext/hash_map limits -ext/hash_map new -ext/hash_map stdexcept -ext/hash_map string -ext/hash_set algorithm -ext/hash_set cmath -ext/hash_set cstddef -ext/hash_set cstdint -ext/hash_set cstring -ext/hash_set functional -ext/hash_set initializer_list -ext/hash_set limits -ext/hash_set new -ext/hash_set string filesystem compare filesystem cstddef filesystem cstdint Index: libcxx/utils/generate_header_tests.py =================================================================== --- libcxx/utils/generate_header_tests.py +++ libcxx/utils/generate_header_tests.py @@ -126,13 +126,11 @@ toplevel_headers = sorted(str(p.relative_to(include)) for p in include.glob('[a-z]*') if is_header(p)) experimental_headers = sorted(str(p.relative_to(include)) for p in include.glob('experimental/[a-z]*') if is_header(p)) - extended_headers = sorted(str(p.relative_to(include)) for p in include.glob('ext/[a-z]*') if is_header(p)) - public_headers = toplevel_headers + experimental_headers + extended_headers + public_headers = toplevel_headers + experimental_headers private_headers = sorted(str(p.relative_to(include)) for p in include.rglob('*') if is_header(p) and str(p.relative_to(include)).startswith('__') and not p.name.startswith('pstl')) variables = { 'toplevel_headers': toplevel_headers, 'experimental_headers': experimental_headers, - 'extended_headers': extended_headers, 'public_headers': public_headers, 'private_headers': private_headers, 'header_restrictions': header_restrictions,