[libc++] Adjust tests using ext/* headers that undefine __DEPRECATED

[john.brawn]

Summary

Several tests undefined DEPRECATED to avoid warnings as they're testing the deprecated ext/hash_map. A better way to do this is to use -Wno-deprecated so it isn't defined in the first place. This prevents these tests from failing when we give a warning when undefining the DEPRECATED macro, as D144654 will do.

For the generated tests however just remove the testing of these header files, so we don't disable the warning when testing the other header files.

[philnik]

This also disables other warnings though. I think it would be better to just not include the <ext/*> stuff in these tests anymore. They're pretty much unmaintained anyways.

[john.brawn]

Changed to removing testing of the ext/* headers.

[Mordante]

I really would like a better rationale for removing these test. Since the are not very actively maintained I really dislike the idea to remove regression tests.

libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp

45

Why not silence this warning for this test instead of removing the tests.
The ext headers may not get a lot of attention, but removing tests may cause accidental regressions not being detected.

[philnik]

In D145691#4189834, @Mordante wrote:

I really would like a better rationale for removing these test. Since the are not very actively maintained I really dislike the idea to remove regression tests.

I only meant removing them from the generated tests, since they are mostly just annoying there. The other tests can just get an // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated.

[john.brawn]

Remove only the generated tests, use -Wno-deprecated elsewhere.

[john.brawn]

Ping.

[philnik]

LGTM. I'll leave final approval to @Mordante.

[john.brawn]

Ping.

[john.brawn]

Ping.

[john.brawn]

Rebased, as some other commits have modified the same tests.

[ldionne]

LGTM. I have no love for these headers and I appreciate the cleanup. I have a small suggestion though.

libcxx/test/libcxx/extensions/hash/specializations.pass.cpp

11

This comment is not desirable anymore.

libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp

 
 #include <__config>
 
-// Prevent <ext/hash_map> 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

     using HandlerType = decltype(std::__libcpp_verbose_abort);
 #endif
 
-// RUN: %{build} -DTEST_138
-#if defined(TEST_138)
-#   include <ext/hash_map>
-    using HandlerType = decltype(std::__libcpp_verbose_abort);
-#endif
-
-// RUN: %{build} -DTEST_139
-#if defined(TEST_139)
-#   include <ext/hash_set>
-    using HandlerType = decltype(std::__libcpp_verbose_abort);
-#endif
-
 // GENERATED-MARKER

libcxx/test/libcxx/clang_tidy.sh.cpp

 // 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 <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 

 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER

libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp

 // UNSUPPORTED: modules-build
 
 // Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
+// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
 
 #include <ext/hash_map>
 #include <cassert>

libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp

 struct unique_ptr;
 
 // Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
+// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
 
 #include <ext/hash_map>
 

libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp

 // UNSUPPORTED: modules-build
 
 // Prevent <ext/hash_set> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
+// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
 
 #include <ext/hash_set>
 #include <cassert>

libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp

 struct unique_ptr;
 
 // Prevent <ext/hash_set> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#   undef __DEPRECATED
-#endif
+// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
 
 #include <ext/hash_set>
 

libcxx/test/libcxx/double_include.sh.cpp

 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 

 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER
 
 #if defined(WITH_MAIN)

libcxx/test/libcxx/extensions/hash/specializations.pass.cpp

 // UNSUPPORTED: modules-build
 
 // NOTE: Undefined __DEPRECATED to prevent this test from failing with -Werror
-#undef __DEPRECATED
+// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
 #include <assert.h>
 #include <ext/hash_map>
 #include <string>

libcxx/test/libcxx/min_max_macros.compile.pass.cpp

 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> 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

 #   include <experimental/vector>
 TEST_MACROS();
 #endif
-#include <ext/hash_map>
-TEST_MACROS();
-#include <ext/hash_set>
-TEST_MACROS();
 // GENERATED-MARKER

libcxx/test/libcxx/modules_include.sh.cpp

 // The Android headers don't appear to be compatible with modules yet
 // XFAIL: LIBCXX-ANDROID-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 #include <__config>
 
 /*

 #if defined(TEST_137) && __cplusplus >= 201103L
 #include <experimental/vector>
 #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 <ext/hash_map>
-#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 <ext/hash_set>
-#endif
 // RUN: echo "wait $TEST_124" >> %t.sh
 // RUN: echo "wait $TEST_125" >> %t.sh
 // RUN: echo "wait $TEST_126" >> %t.sh

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

libcxx/test/libcxx/nasty_macros.compile.pass.cpp

 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> 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.

 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER

libcxx/test/libcxx/no_assert_include.compile.pass.cpp

 // The system-provided <uchar.h> seems to be broken on AIX
 // XFAIL: LIBCXX-AIX-FIXME
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 

 #if __cplusplus >= 201103L
 #   include <experimental/vector>
 #endif
-#include <ext/hash_map>
-#include <ext/hash_set>
 // GENERATED-MARKER
 
 #ifdef assert

libcxx/test/libcxx/transitive_includes.sh.cpp

 // this test instead.
 // UNSUPPORTED: transitive-includes-disabled
 
-// Prevent <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-#    undef __DEPRECATED
-#endif
-
 /*
 BEGIN-SCRIPT
 

 #if defined(TEST_137)
 #include <experimental/vector>
 #endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_138 2> %t/header.ext_hash_map
-#if defined(TEST_138)
-#include <ext/hash_map>
-#endif
-// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_139 2> %t/header.ext_hash_set
-#if defined(TEST_139)
-#include <ext/hash_set>
-#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

libcxx/test/libcxx/transitive_includes/cxx03.csv

 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 cerrno
 filesystem compare
 filesystem concepts

libcxx/test/libcxx/transitive_includes/cxx11.csv

 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 cerrno
 filesystem compare
 filesystem concepts

libcxx/test/libcxx/transitive_includes/cxx14.csv

 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 cerrno
 filesystem compare
 filesystem concepts

libcxx/test/libcxx/transitive_includes/cxx17.csv

 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 cerrno
 filesystem compare
 filesystem concepts

libcxx/test/libcxx/transitive_includes/cxx20.csv

 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 cerrno
 filesystem compare
 filesystem concepts

libcxx/test/libcxx/transitive_includes/cxx2b.csv

 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_map type_traits
-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
-ext/hash_set type_traits
 filesystem cerrno
 filesystem compare
 filesystem cstddef

libcxx/utils/generate_header_tests.py

 
     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('__'))
     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,