[libcxx-commits] [libcxx] 4d9c936 - [libc++] Adjust tests using ext/* headers that undefine __DEPRECATED
John Brawn via libcxx-commits
libcxx-commits at lists.llvm.org
Thu May 11 03:47:55 PDT 2023
Author: John Brawn
Date: 2023-05-11T11:47:11+01:00
New Revision: 4d9c936a3e1a647356226c0355a194b94465ad2c
URL: https://github.com/llvm/llvm-project/commit/4d9c936a3e1a647356226c0355a194b94465ad2c
DIFF: https://github.com/llvm/llvm-project/commit/4d9c936a3e1a647356226c0355a194b94465ad2c.diff
LOG: [libc++] Adjust tests using ext/* headers that undefine __DEPRECATED
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.
Differential Revision: https://reviews.llvm.org/D145691
Added:
Modified:
libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp
libcxx/test/libcxx/clang_tidy.sh.cpp
libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp
libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp
libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp
libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp
libcxx/test/libcxx/double_include.sh.cpp
libcxx/test/libcxx/extensions/hash/specializations.pass.cpp
libcxx/test/libcxx/min_max_macros.compile.pass.cpp
libcxx/test/libcxx/modules_include.sh.cpp
libcxx/test/libcxx/nasty_macros.compile.pass.cpp
libcxx/test/libcxx/no_assert_include.compile.pass.cpp
libcxx/test/libcxx/transitive_includes.sh.cpp
libcxx/test/libcxx/transitive_includes/cxx03.csv
libcxx/test/libcxx/transitive_includes/cxx11.csv
libcxx/test/libcxx/transitive_includes/cxx14.csv
libcxx/test/libcxx/transitive_includes/cxx17.csv
libcxx/test/libcxx/transitive_includes/cxx20.csv
libcxx/test/libcxx/transitive_includes/cxx2b.csv
libcxx/utils/generate_header_tests.py
Removed:
################################################################################
diff --git a/libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp b/libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp
index 7eb8acbe98832..1f2a4650c9d52 100644
--- a/libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp
+++ b/libcxx/test/libcxx/assertions/headers_declare_verbose_abort.sh.cpp
@@ -40,11 +40,6 @@ END-SCRIPT
#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
@@ -751,16 +746,4 @@ int main(int, char**) { return 0; }
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
diff --git a/libcxx/test/libcxx/clang_tidy.sh.cpp b/libcxx/test/libcxx/clang_tidy.sh.cpp
index 74df7af5c191b..ab9bbc6c39144 100644
--- a/libcxx/test/libcxx/clang_tidy.sh.cpp
+++ b/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 <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-# undef __DEPRECATED
-#endif
-
/*
BEGIN-SCRIPT
@@ -262,6 +257,4 @@ END-SCRIPT
#if __cplusplus >= 201103L
# include <experimental/vector>
#endif
-#include <ext/hash_map>
-#include <ext/hash_set>
// GENERATED-MARKER
diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp b/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp
index c175356cadcd3..27a226f4ce2b3 100644
--- a/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp
+++ b/libcxx/test/libcxx/containers/gnu_cxx/hash_map.pass.cpp
@@ -9,9 +9,7 @@
// 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>
diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp b/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp
index 02d84718ea98c..522f0273897b7 100644
--- a/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp
+++ b/libcxx/test/libcxx/containers/gnu_cxx/hash_map_name_lookup.pass.cpp
@@ -16,9 +16,7 @@ struct equal_to;
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>
diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp b/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp
index 3f7698c5c3141..45b3e1bd99f13 100644
--- a/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp
+++ b/libcxx/test/libcxx/containers/gnu_cxx/hash_set.pass.cpp
@@ -9,9 +9,7 @@
// 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>
diff --git a/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp b/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp
index b215e6c12034e..1f0d6c81894e4 100644
--- a/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp
+++ b/libcxx/test/libcxx/containers/gnu_cxx/hash_set_name_lookup.pass.cpp
@@ -16,9 +16,7 @@ struct equal_to;
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>
diff --git a/libcxx/test/libcxx/double_include.sh.cpp b/libcxx/test/libcxx/double_include.sh.cpp
index b6bbf4e960506..292f53a0d077a 100644
--- a/libcxx/test/libcxx/double_include.sh.cpp
+++ b/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 <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-# undef __DEPRECATED
-#endif
-
/*
BEGIN-SCRIPT
@@ -260,8 +255,6 @@ END-SCRIPT
#if __cplusplus >= 201103L
# include <experimental/vector>
#endif
-#include <ext/hash_map>
-#include <ext/hash_set>
// GENERATED-MARKER
#if defined(WITH_MAIN)
diff --git a/libcxx/test/libcxx/extensions/hash/specializations.pass.cpp b/libcxx/test/libcxx/extensions/hash/specializations.pass.cpp
index 8e386ed672ce0..8e452e1e54ccd 100644
--- a/libcxx/test/libcxx/extensions/hash/specializations.pass.cpp
+++ b/libcxx/test/libcxx/extensions/hash/specializations.pass.cpp
@@ -8,8 +8,8 @@
// UNSUPPORTED: modules-build
-// NOTE: Undefined __DEPRECATED to prevent this test from failing with -Werror
-#undef __DEPRECATED
+// Prevent <ext/hash_set> from generating deprecated warnings for this test.
+// ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
#include <assert.h>
#include <ext/hash_map>
#include <string>
diff --git a/libcxx/test/libcxx/min_max_macros.compile.pass.cpp b/libcxx/test/libcxx/min_max_macros.compile.pass.cpp
index 9dd434507ed38..d032e97f1ddc9 100644
--- a/libcxx/test/libcxx/min_max_macros.compile.pass.cpp
+++ b/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 <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
@@ -398,8 +393,4 @@ TEST_MACROS();
# include <experimental/vector>
TEST_MACROS();
#endif
-#include <ext/hash_map>
-TEST_MACROS();
-#include <ext/hash_set>
-TEST_MACROS();
// GENERATED-MARKER
diff --git a/libcxx/test/libcxx/modules_include.sh.cpp b/libcxx/test/libcxx/modules_include.sh.cpp
index 1ef40a14c421d..3f3967aa418bb 100644
--- a/libcxx/test/libcxx/modules_include.sh.cpp
+++ b/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 <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-# undef __DEPRECATED
-#endif
-
#include <__config>
/*
@@ -868,18 +863,8 @@ END-SCRIPT
#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
@@ -894,7 +879,5 @@ END-SCRIPT
// 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
diff --git a/libcxx/test/libcxx/nasty_macros.compile.pass.cpp b/libcxx/test/libcxx/nasty_macros.compile.pass.cpp
index 3e3e1340a7e34..28b3162678d54 100644
--- a/libcxx/test/libcxx/nasty_macros.compile.pass.cpp
+++ b/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 <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.
@@ -384,6 +379,4 @@ END-SCRIPT
#if __cplusplus >= 201103L
# include <experimental/vector>
#endif
-#include <ext/hash_map>
-#include <ext/hash_set>
// GENERATED-MARKER
diff --git a/libcxx/test/libcxx/no_assert_include.compile.pass.cpp b/libcxx/test/libcxx/no_assert_include.compile.pass.cpp
index f92b78779f2ec..779a21a02dd50 100644
--- a/libcxx/test/libcxx/no_assert_include.compile.pass.cpp
+++ b/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 <ext/hash_map> from generating deprecated warnings for this test.
-#if defined(__DEPRECATED)
-# undef __DEPRECATED
-#endif
-
/*
BEGIN-SCRIPT
@@ -257,8 +252,6 @@ END-SCRIPT
#if __cplusplus >= 201103L
# include <experimental/vector>
#endif
-#include <ext/hash_map>
-#include <ext/hash_set>
// GENERATED-MARKER
#ifdef assert
diff --git a/libcxx/test/libcxx/transitive_includes.sh.cpp b/libcxx/test/libcxx/transitive_includes.sh.cpp
index 9e00408bd4fa6..1bbc906bb5072 100644
--- a/libcxx/test/libcxx/transitive_includes.sh.cpp
+++ b/libcxx/test/libcxx/transitive_includes.sh.cpp
@@ -32,11 +32,6 @@
// 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
@@ -542,14 +537,6 @@ END-SCRIPT
#if defined(TEST_137)
#include <experimental/vector>
#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 <ext/hash_map>
-#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 <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
diff --git a/libcxx/test/libcxx/transitive_includes/cxx03.csv b/libcxx/test/libcxx/transitive_includes/cxx03.csv
index 7460de6733c82..408fe33c61c39 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx03.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx03.csv
@@ -276,33 +276,6 @@ experimental/unordered_set unordered_set
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
diff --git a/libcxx/test/libcxx/transitive_includes/cxx11.csv b/libcxx/test/libcxx/transitive_includes/cxx11.csv
index 1a8c4214beb97..a14e23db18f66 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx11.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx11.csv
@@ -276,33 +276,6 @@ experimental/unordered_set unordered_set
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
diff --git a/libcxx/test/libcxx/transitive_includes/cxx14.csv b/libcxx/test/libcxx/transitive_includes/cxx14.csv
index 43888fe8f3037..6d780f829cb71 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx14.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx14.csv
@@ -278,33 +278,6 @@ experimental/unordered_set unordered_set
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
diff --git a/libcxx/test/libcxx/transitive_includes/cxx17.csv b/libcxx/test/libcxx/transitive_includes/cxx17.csv
index 43888fe8f3037..6d780f829cb71 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx17.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx17.csv
@@ -278,33 +278,6 @@ experimental/unordered_set unordered_set
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
diff --git a/libcxx/test/libcxx/transitive_includes/cxx20.csv b/libcxx/test/libcxx/transitive_includes/cxx20.csv
index cb65ac77ce4d9..d7090b6470caf 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx20.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx20.csv
@@ -285,33 +285,6 @@ experimental/unordered_set unordered_set
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
diff --git a/libcxx/test/libcxx/transitive_includes/cxx2b.csv b/libcxx/test/libcxx/transitive_includes/cxx2b.csv
index 7c1c0f49a8ee1..a950e70633c71 100644
--- a/libcxx/test/libcxx/transitive_includes/cxx2b.csv
+++ b/libcxx/test/libcxx/transitive_includes/cxx2b.csv
@@ -184,27 +184,6 @@ experimental/unordered_set unordered_set
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
diff --git a/libcxx/utils/generate_header_tests.py b/libcxx/utils/generate_header_tests.py
index eacf1f8d84192..db6a17b63931a 100755
--- a/libcxx/utils/generate_header_tests.py
+++ b/libcxx/utils/generate_header_tests.py
@@ -126,13 +126,11 @@ def main():
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,
More information about the libcxx-commits
mailing list