This is an archive of the discontinued LLVM Phabricator instance.

Differential D145691

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

Authored by john.brawn on Mar 9 2023, 7:34 AM.

Details

Reviewers
philnik
ldionne
Group Reviewers
Restricted Project
Commits
rG4d9c936a3e1a: [libc++] Adjust tests using ext/* headers that undefine __DEPRECATED
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.

Diff Detail

Event Timeline

john.brawn created this revision.Mar 9 2023, 7:34 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 9 2023, 7:34 AM
john.brawn requested review of this revision.Mar 9 2023, 7:34 AM
Herald added a project: Restricted Project. · View Herald TranscriptMar 9 2023, 7:34 AM
Herald added 1 blocking reviewer(s): Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
john.brawn added a child revision: D144654: [Lex] Warn when defining or undefining any builtin macro.Mar 9 2023, 7:35 AM
john.brawn mentioned this in D144654: [Lex] Warn when defining or undefining any builtin macro.
philnik requested changes to this revision.Mar 9 2023, 7:38 AM
philnik added a subscriber: 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.

This revision now requires changes to proceed.Mar 9 2023, 7:38 AM
Harbormaster completed remote builds in B218389: Diff 503765.Mar 9 2023, 8:02 AM
john.brawn updated this revision to Diff 504658.Mar 13 2023, 7:55 AM
john.brawn retitled this revision from [libc++][NFC] Use -Wno-deprecated instead of undefining __DEPRECATED to [libc++] Remove ext/* headers from tests.
john.brawn edited the summary of this revision. (Show Details)

Changed to removing testing of the ext/* headers.

Herald added a subscriber: arichardson. · View Herald TranscriptMar 13 2023, 7:55 AM
Harbormaster completed remote builds in B219047: Diff 504658.Mar 13 2023, 8:21 AM
Mordante added a subscriber: Mordante.Mar 13 2023, 9:38 AM

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
44

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 added a comment.Mar 14 2023, 2:58 PM
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 updated this revision to Diff 505554.Mar 15 2023, 10:30 AM
john.brawn retitled this revision from [libc++] Remove ext/* headers from tests to [libc++] Adjust tests using ext/* headers that undefine __DEPRECATED.
john.brawn edited the summary of this revision. (Show Details)

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

Harbormaster completed remote builds in B219681: Diff 505554.Mar 15 2023, 10:31 AM
john.brawn added a comment.Apr 6 2023, 5:46 AM

Ping.

philnik accepted this revision as: philnik.Apr 6 2023, 6:02 AM

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

john.brawn added a comment.Apr 21 2023, 6:25 AM

Ping.

john.brawn added a comment.May 2 2023, 6:06 AM

Ping.

john.brawn updated this revision to Diff 521002.May 10 2023, 8:29 AM

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

Harbormaster completed remote builds in B231103: Diff 521002.May 10 2023, 12:40 PM
ldionne accepted this revision.May 10 2023, 1:08 PM
ldionne added a subscriber: 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
10–11

This comment is not desirable anymore.

This revision is now accepted and ready to land.May 10 2023, 1:08 PM
Closed by commit rG4d9c936a3e1a: [libc++] Adjust tests using ext/* headers that undefine __DEPRECATED (authored by john.brawn). · Explain WhyMay 11 2023, 3:47 AM
This revision was automatically updated to reflect the committed changes.
john.brawn added a commit: rG4d9c936a3e1a: [libc++] Adjust tests using ext/* headers that undefine __DEPRECATED.

Revision Contents

Diff 521248

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

Show All 34 Lines
#endif #endif
""".format(**vars)) """.format(**vars))
END-SCRIPT END-SCRIPT
*/ */
#include <__config> #include <__config>
// Prevent <ext/hash_map> from generating deprecated warnings for this test.
#if defined(__DEPRECATED)
MordanteUnsubmitted
Not Done
ReplyInline Actions

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.

Mordante: Why not silence this warning for this test instead of removing the tests. The ext headers may…
# undef __DEPRECATED
#endif
int main(int, char**) { return 0; } int main(int, char**) { return 0; }
// DO NOT MANUALLY EDIT ANYTHING BETWEEN THE MARKERS BELOW // DO NOT MANUALLY EDIT ANYTHING BETWEEN THE MARKERS BELOW
// GENERATED-MARKER // GENERATED-MARKER
// RUN: %{build} -DTEST_0 // RUN: %{build} -DTEST_0
#if defined(TEST_0) #if defined(TEST_0)
# include <algorithm> # include <algorithm>
using HandlerType = decltype(std::__libcpp_verbose_abort); using HandlerType = decltype(std::__libcpp_verbose_abort);
▲ Show 20 Lines • Show All 690 Lines • ▼ Show 20 Lines
#endif #endif
// RUN: %{build} -DTEST_137 // RUN: %{build} -DTEST_137
#if defined(TEST_137) && __cplusplus >= 201103L #if defined(TEST_137) && __cplusplus >= 201103L
# include <experimental/vector> # include <experimental/vector>
using HandlerType = decltype(std::__libcpp_verbose_abort); using HandlerType = decltype(std::__libcpp_verbose_abort);
#endif #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 // GENERATED-MARKER

libcxx/test/libcxx/clang_tidy.sh.cpp

Show All 9 Lines
// The GCC compiler flags are not always compatible with clang-tidy. // The GCC compiler flags are not always compatible with clang-tidy.
// UNSUPPORTED: gcc // UNSUPPORTED: gcc
// TODO: run clang-tidy with modules enabled once they are supported // TODO: run clang-tidy with modules enabled once they are supported
// 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=.* --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 // 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 BEGIN-SCRIPT
for header in public_headers: for header in public_headers:
print("{}#{}include <{}>{}".format( print("{}#{}include <{}>{}".format(
'#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '', '#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '',
3 * ' ' if header in header_restrictions else '', 3 * ' ' if header in header_restrictions else '',
header, header,
▲ Show 20 Lines • Show All 226 Lines • ▼ Show 20 Lines
# include <experimental/unordered_set> # include <experimental/unordered_set>
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/utility> # include <experimental/utility>
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/vector> # include <experimental/vector>
#endif #endif
#include <ext/hash_map>
#include <ext/hash_set>
// GENERATED-MARKER // GENERATED-MARKER

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

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: modules-build // UNSUPPORTED: modules-build
// Prevent <ext/hash_map> from generating deprecated warnings for this test. // Prevent <ext/hash_map> from generating deprecated warnings for this test.
#if defined(__DEPRECATED) // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
# undef __DEPRECATED
#endif
#include <ext/hash_map> #include <ext/hash_map>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "count_new.h" #include "count_new.h"
void test_default_does_not_allocate() { void test_default_does_not_allocate() {
Show All 16 Lines

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

Show All 10 Lines
// Poison the std:: names we might use inside __gnu_cxx to ensure they're // Poison the std:: names we might use inside __gnu_cxx to ensure they're
// properly qualified. // properly qualified.
struct allocator; struct allocator;
struct pair; struct pair;
struct equal_to; struct equal_to;
struct unique_ptr; struct unique_ptr;
// Prevent <ext/hash_map> from generating deprecated warnings for this test. // Prevent <ext/hash_map> from generating deprecated warnings for this test.
#if defined(__DEPRECATED) // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
# undef __DEPRECATED
#endif
#include <ext/hash_map> #include <ext/hash_map>
#include "test_macros.h" #include "test_macros.h"
namespace __gnu_cxx { namespace __gnu_cxx {
template class hash_map<int, int>; template class hash_map<int, int>;
Show All 10 Lines

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

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: modules-build // UNSUPPORTED: modules-build
// Prevent <ext/hash_set> from generating deprecated warnings for this test. // Prevent <ext/hash_set> from generating deprecated warnings for this test.
#if defined(__DEPRECATED) // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
# undef __DEPRECATED
#endif
#include <ext/hash_set> #include <ext/hash_set>
#include <cassert> #include <cassert>
#include "test_macros.h" #include "test_macros.h"
#include "count_new.h" #include "count_new.h"
void test_default_does_not_allocate() { void test_default_does_not_allocate() {
Show All 16 Lines

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

Show All 10 Lines
// Poison the std:: names we might use inside __gnu_cxx to ensure they're // Poison the std:: names we might use inside __gnu_cxx to ensure they're
// properly qualified. // properly qualified.
struct allocator; struct allocator;
struct pair; struct pair;
struct equal_to; struct equal_to;
struct unique_ptr; struct unique_ptr;
// Prevent <ext/hash_set> from generating deprecated warnings for this test. // Prevent <ext/hash_set> from generating deprecated warnings for this test.
#if defined(__DEPRECATED) // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
# undef __DEPRECATED
#endif
#include <ext/hash_set> #include <ext/hash_set>
#include "test_macros.h" #include "test_macros.h"
namespace __gnu_cxx { namespace __gnu_cxx {
template class hash_set<int>; template class hash_set<int>;
} }
Show All 9 Lines

libcxx/test/libcxx/double_include.sh.cpp

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Test that we can include each header in two TU's and link them together. // Test that we can include each header in two TU's and link them together.
// RUN: %{cxx} -c %s -o %t.first.o %{flags} %{compile_flags} // RUN: %{cxx} -c %s -o %t.first.o %{flags} %{compile_flags}
// RUN: %{cxx} -c %s -o %t.second.o -DWITH_MAIN %{flags} %{compile_flags} // RUN: %{cxx} -c %s -o %t.second.o -DWITH_MAIN %{flags} %{compile_flags}
// RUN: %{cxx} -o %t.exe %t.first.o %t.second.o %{flags} %{link_flags} // RUN: %{cxx} -o %t.exe %t.first.o %t.second.o %{flags} %{link_flags}
// RUN: %{run} // RUN: %{run}
// Prevent <ext/hash_map> from generating deprecated warnings for this test.
#if defined(__DEPRECATED)
# undef __DEPRECATED
#endif
/* /*
BEGIN-SCRIPT BEGIN-SCRIPT
for header in public_headers: for header in public_headers:
print("{}#{}include <{}>{}".format( print("{}#{}include <{}>{}".format(
'#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '', '#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '',
3 * ' ' if header in header_restrictions else '', 3 * ' ' if header in header_restrictions else '',
header, header,
▲ Show 20 Lines • Show All 226 Lines • ▼ Show 20 Lines
# include <experimental/unordered_set> # include <experimental/unordered_set>
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/utility> # include <experimental/utility>
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/vector> # include <experimental/vector>
#endif #endif
#include <ext/hash_map>
#include <ext/hash_set>
// GENERATED-MARKER // GENERATED-MARKER
#if defined(WITH_MAIN) #if defined(WITH_MAIN)
int main(int, char**) { return 0; } int main(int, char**) { return 0; }
#endif #endif

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

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// UNSUPPORTED: modules-build // UNSUPPORTED: modules-build
// NOTE: Undefined __DEPRECATED to prevent this test from failing with -Werror // Prevent <ext/hash_set> from generating deprecated warnings for this test.
ldionneUnsubmitted
Not Done
ReplyInline Actions

This comment is not desirable anymore.

ldionne: This comment is not desirable anymore.
#undef __DEPRECATED // ADDITIONAL_COMPILE_FLAGS: -Wno-deprecated
#include <assert.h> #include <assert.h>
#include <ext/hash_map> #include <ext/hash_map>
#include <string> #include <string>
#include "test_macros.h" #include "test_macros.h"
int main(int, char**) int main(int, char**)
{ {
Show All 16 Lines

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

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Test that headers are not tripped up by the surrounding code defining the // Test that headers are not tripped up by the surrounding code defining the
// min() and max() macros. // 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 TEST_MACROS() static_assert(min() == true && max() == true, "")
#define min() true #define min() true
#define max() true #define max() true
/* /*
BEGIN-SCRIPT BEGIN-SCRIPT
for header in public_headers: for header in public_headers:
▲ Show 20 Lines • Show All 368 Lines • ▼ Show 20 Lines
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/utility> # include <experimental/utility>
TEST_MACROS(); TEST_MACROS();
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/vector> # include <experimental/vector>
TEST_MACROS(); TEST_MACROS();
#endif #endif
#include <ext/hash_map>
TEST_MACROS();
#include <ext/hash_set>
TEST_MACROS();
// GENERATED-MARKER // GENERATED-MARKER

libcxx/test/libcxx/modules_include.sh.cpp

Show All 14 Lines
// The Windows headers don't appear to be compatible with modules // The Windows headers don't appear to be compatible with modules
// UNSUPPORTED: windows // UNSUPPORTED: windows
// UNSUPPORTED: buildhost=windows // UNSUPPORTED: buildhost=windows
// The Android headers don't appear to be compatible with modules yet // The Android headers don't appear to be compatible with modules yet
// XFAIL: LIBCXX-ANDROID-FIXME // XFAIL: LIBCXX-ANDROID-FIXME
// Prevent <ext/hash_map> from generating deprecated warnings for this test.
#if defined(__DEPRECATED)
# undef __DEPRECATED
#endif
#include <__config> #include <__config>
/* /*
BEGIN-SCRIPT BEGIN-SCRIPT
for i, header in enumerate(public_headers): for i, header in enumerate(public_headers):
print("// {}: echo '%{{cxx}} %s %{{flags}} %{{compile_flags}} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_{} &' >> %t.sh".format('RUN', i)) print("// {}: echo '%{{cxx}} %s %{{flags}} %{{compile_flags}} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_{} &' >> %t.sh".format('RUN', i))
print("// {}: echo 'TEST_{}=$!' >> %t.sh".format('RUN', i)) print("// {}: echo 'TEST_{}=$!' >> %t.sh".format('RUN', i))
▲ Show 20 Lines • Show All 827 Lines • ▼ Show 20 Lines
#include <experimental/utility> #include <experimental/utility>
#endif #endif
// RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_137 &' >> %t.sh // RUN: echo '%{cxx} %s %{flags} %{compile_flags} -fmodules -fcxx-modules -fmodules-cache-path=%t -fsyntax-only -DTEST_137 &' >> %t.sh
// RUN: echo 'TEST_137=$!' >> %t.sh // RUN: echo 'TEST_137=$!' >> %t.sh
// RUN: echo "wait $TEST_121" >> %t.sh // RUN: echo "wait $TEST_121" >> %t.sh
#if defined(TEST_137) && __cplusplus >= 201103L #if defined(TEST_137) && __cplusplus >= 201103L
#include <experimental/vector> #include <experimental/vector>
#endif #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 // 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 // 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_124" >> %t.sh
// RUN: echo "wait $TEST_125" >> %t.sh // RUN: echo "wait $TEST_125" >> %t.sh
// RUN: echo "wait $TEST_126" >> %t.sh // RUN: echo "wait $TEST_126" >> %t.sh
// RUN: echo "wait $TEST_127" >> %t.sh // RUN: echo "wait $TEST_127" >> %t.sh
// RUN: echo "wait $TEST_128" >> %t.sh // RUN: echo "wait $TEST_128" >> %t.sh
// RUN: echo "wait $TEST_129" >> %t.sh // RUN: echo "wait $TEST_129" >> %t.sh
// RUN: echo "wait $TEST_130" >> %t.sh // RUN: echo "wait $TEST_130" >> %t.sh
// RUN: echo "wait $TEST_131" >> %t.sh // RUN: echo "wait $TEST_131" >> %t.sh
// RUN: echo "wait $TEST_132" >> %t.sh // RUN: echo "wait $TEST_132" >> %t.sh
// RUN: echo "wait $TEST_133" >> %t.sh // RUN: echo "wait $TEST_133" >> %t.sh
// RUN: echo "wait $TEST_134" >> %t.sh // RUN: echo "wait $TEST_134" >> %t.sh
// RUN: echo "wait $TEST_135" >> %t.sh // RUN: echo "wait $TEST_135" >> %t.sh
// RUN: echo "wait $TEST_136" >> %t.sh // RUN: echo "wait $TEST_136" >> %t.sh
// RUN: echo "wait $TEST_137" >> %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 // RUN: bash %t.sh
// GENERATED-MARKER // GENERATED-MARKER

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

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Test that headers are not tripped up by the surrounding code defining various // Test that headers are not tripped up by the surrounding code defining various
// alphabetic macros. // 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!!! #define NASTY_MACRO This should not be expanded!!!
// libc++ does not use single-letter names as a matter of principle. // libc++ does not use single-letter names as a matter of principle.
// But Windows' own <wchar.h>, <math.h>, and <exception> use many of these // But Windows' own <wchar.h>, <math.h>, and <exception> use many of these
// (at least C,E,F,I,M,N,P,S,X,Y,Z) as uglified function parameter names, // (at least C,E,F,I,M,N,P,S,X,Y,Z) as uglified function parameter names,
// so don't define these on Windows. // so don't define these on Windows.
// //
#ifndef _WIN32 #ifndef _WIN32
▲ Show 20 Lines • Show All 354 Lines • ▼ Show 20 Lines
# include <experimental/unordered_set> # include <experimental/unordered_set>
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/utility> # include <experimental/utility>
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/vector> # include <experimental/vector>
#endif #endif
#include <ext/hash_map>
#include <ext/hash_set>
// GENERATED-MARKER // GENERATED-MARKER

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

//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// //
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. // Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
// See https://llvm.org/LICENSE.txt for license information. // See https://llvm.org/LICENSE.txt for license information.
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
// //
//===----------------------------------------------------------------------===// //===----------------------------------------------------------------------===//
// Ensure that none of the standard C++ headers implicitly include cassert or // Ensure that none of the standard C++ headers implicitly include cassert or
// assert.h (because assert() is implemented as a macro). // 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 BEGIN-SCRIPT
for header in public_headers: for header in public_headers:
if header == 'cassert': if header == 'cassert':
continue continue
print("{}#{}include <{}>{}".format( print("{}#{}include <{}>{}".format(
'#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '', '#if ' + header_restrictions[header] + '\n' if header in header_restrictions else '',
▲ Show 20 Lines • Show All 227 Lines • ▼ Show 20 Lines
# include <experimental/unordered_set> # include <experimental/unordered_set>
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/utility> # include <experimental/utility>
#endif #endif
#if __cplusplus >= 201103L #if __cplusplus >= 201103L
# include <experimental/vector> # include <experimental/vector>
#endif #endif
#include <ext/hash_map>
#include <ext/hash_set>
// GENERATED-MARKER // GENERATED-MARKER
#ifdef assert #ifdef assert
#error "Do not include cassert or assert.h in standard header files" #error "Do not include cassert or assert.h in standard header files"
#endif #endif

libcxx/test/libcxx/transitive_includes.sh.cpp

Show All 26 Lines
// This test uses --trace-includes, which is not supported by GCC. // This test uses --trace-includes, which is not supported by GCC.
// UNSUPPORTED: gcc // UNSUPPORTED: gcc
// This test is not supported when we remove the transitive includes provided for backwards // This test is not supported when we remove the transitive includes provided for backwards
// compatibility. When we bulk-remove them, we'll adjust the includes that are expected by // compatibility. When we bulk-remove them, we'll adjust the includes that are expected by
// this test instead. // this test instead.
// UNSUPPORTED: transitive-includes-disabled // UNSUPPORTED: transitive-includes-disabled
// Prevent <ext/hash_map> from generating deprecated warnings for this test.
#if defined(__DEPRECATED)
# undef __DEPRECATED
#endif
/* /*
BEGIN-SCRIPT BEGIN-SCRIPT
import re import re
# To re-generate the list of expected headers, temporarily set this to True, re-generate # To re-generate the list of expected headers, temporarily set this to True, re-generate
# the file and run this test. # the file and run this test.
# Note that this needs to be done for all supported language versions of libc++: # Note that this needs to be done for all supported language versions of libc++:
▲ Show 20 Lines • Show All 489 Lines • ▼ Show 20 Lines
// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes --preprocess -DTEST_136 > /dev/null 2> %t/header.experimental_utility // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes --preprocess -DTEST_136 > /dev/null 2> %t/header.experimental_utility
#if defined(TEST_136) #if defined(TEST_136)
#include <experimental/utility> #include <experimental/utility>
#endif #endif
// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes --preprocess -DTEST_137 > /dev/null 2> %t/header.experimental_vector // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes --preprocess -DTEST_137 > /dev/null 2> %t/header.experimental_vector
#if defined(TEST_137) #if defined(TEST_137)
#include <experimental/vector> #include <experimental/vector>
#endif #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: %{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 // RUN: diff -w %S/transitive_includes/%{cxx_std}.csv %t/transitive_includes.csv
// GENERATED-MARKER // GENERATED-MARKER

libcxx/test/libcxx/transitive_includes/cxx03.csv

Show First 20 Lines • Show All 270 Lines • ▼ Show 20 Lines
experimental/unordered_map functional experimental/unordered_map functional
experimental/unordered_map unordered_map experimental/unordered_map unordered_map
experimental/unordered_map vector experimental/unordered_map vector
experimental/unordered_set experimental/memory_resource experimental/unordered_set experimental/memory_resource
experimental/unordered_set unordered_set experimental/unordered_set unordered_set
experimental/utility utility experimental/utility utility
experimental/vector experimental/memory_resource experimental/vector experimental/memory_resource
experimental/vector vector 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 compare
filesystem concepts filesystem concepts
filesystem cstddef filesystem cstddef
filesystem cstdint filesystem cstdint
filesystem cstdlib filesystem cstdlib
filesystem ctime filesystem ctime
filesystem iomanip filesystem iomanip
filesystem iosfwd filesystem iosfwd
▲ Show 20 Lines • Show All 672 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx11.csv

Show First 20 Lines • Show All 270 Lines • ▼ Show 20 Lines
experimental/unordered_map functional experimental/unordered_map functional
experimental/unordered_map unordered_map experimental/unordered_map unordered_map
experimental/unordered_map vector experimental/unordered_map vector
experimental/unordered_set experimental/memory_resource experimental/unordered_set experimental/memory_resource
experimental/unordered_set unordered_set experimental/unordered_set unordered_set
experimental/utility utility experimental/utility utility
experimental/vector experimental/memory_resource experimental/vector experimental/memory_resource
experimental/vector vector 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 compare
filesystem concepts filesystem concepts
filesystem cstddef filesystem cstddef
filesystem cstdint filesystem cstdint
filesystem cstdlib filesystem cstdlib
filesystem ctime filesystem ctime
filesystem iomanip filesystem iomanip
filesystem iosfwd filesystem iosfwd
▲ Show 20 Lines • Show All 673 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx14.csv

Show First 20 Lines • Show All 272 Lines • ▼ Show 20 Lines
experimental/unordered_map functional experimental/unordered_map functional
experimental/unordered_map unordered_map experimental/unordered_map unordered_map
experimental/unordered_map vector experimental/unordered_map vector
experimental/unordered_set experimental/memory_resource experimental/unordered_set experimental/memory_resource
experimental/unordered_set unordered_set experimental/unordered_set unordered_set
experimental/utility utility experimental/utility utility
experimental/vector experimental/memory_resource experimental/vector experimental/memory_resource
experimental/vector vector 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 compare
filesystem concepts filesystem concepts
filesystem cstddef filesystem cstddef
filesystem cstdint filesystem cstdint
filesystem cstdlib filesystem cstdlib
filesystem ctime filesystem ctime
filesystem iomanip filesystem iomanip
filesystem iosfwd filesystem iosfwd
▲ Show 20 Lines • Show All 673 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx17.csv

Show First 20 Lines • Show All 272 Lines • ▼ Show 20 Lines
experimental/unordered_map functional experimental/unordered_map functional
experimental/unordered_map unordered_map experimental/unordered_map unordered_map
experimental/unordered_map vector experimental/unordered_map vector
experimental/unordered_set experimental/memory_resource experimental/unordered_set experimental/memory_resource
experimental/unordered_set unordered_set experimental/unordered_set unordered_set
experimental/utility utility experimental/utility utility
experimental/vector experimental/memory_resource experimental/vector experimental/memory_resource
experimental/vector vector 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 compare
filesystem concepts filesystem concepts
filesystem cstddef filesystem cstddef
filesystem cstdint filesystem cstdint
filesystem cstdlib filesystem cstdlib
filesystem ctime filesystem ctime
filesystem iomanip filesystem iomanip
filesystem iosfwd filesystem iosfwd
▲ Show 20 Lines • Show All 673 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx20.csv

Show First 20 Lines • Show All 279 Lines • ▼ Show 20 Lines
experimental/unordered_map functional experimental/unordered_map functional
experimental/unordered_map unordered_map experimental/unordered_map unordered_map
experimental/unordered_map vector experimental/unordered_map vector
experimental/unordered_set experimental/memory_resource experimental/unordered_set experimental/memory_resource
experimental/unordered_set unordered_set experimental/unordered_set unordered_set
experimental/utility utility experimental/utility utility
experimental/vector experimental/memory_resource experimental/vector experimental/memory_resource
experimental/vector vector 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 compare
filesystem concepts filesystem concepts
filesystem cstddef filesystem cstddef
filesystem cstdint filesystem cstdint
filesystem cstdlib filesystem cstdlib
filesystem ctime filesystem ctime
filesystem iomanip filesystem iomanip
filesystem iosfwd filesystem iosfwd
▲ Show 20 Lines • Show All 671 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx2b.csv

Show First 20 Lines • Show All 178 Lines • ▼ Show 20 Lines
experimental/type_traits type_traits experimental/type_traits type_traits
experimental/unordered_map experimental/memory_resource experimental/unordered_map experimental/memory_resource
experimental/unordered_map unordered_map experimental/unordered_map unordered_map
experimental/unordered_set experimental/memory_resource experimental/unordered_set experimental/memory_resource
experimental/unordered_set unordered_set experimental/unordered_set unordered_set
experimental/utility utility experimental/utility utility
experimental/vector experimental/memory_resource experimental/vector experimental/memory_resource
experimental/vector vector 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 compare
filesystem cstddef filesystem cstddef
filesystem cstdint filesystem cstdint
filesystem ctime filesystem ctime
filesystem iomanip filesystem iomanip
filesystem iosfwd filesystem iosfwd
filesystem limits filesystem limits
filesystem locale filesystem locale
▲ Show 20 Lines • Show All 451 Lines • Show Last 20 Lines

libcxx/utils/generate_header_tests.py

Show First 20 Lines • Show All 120 Lines • ▼ Show 20 Lines
def main(): def main():
monorepo_root = pathlib.Path(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__))))) monorepo_root = pathlib.Path(os.path.dirname(os.path.dirname(os.path.dirname(os.path.abspath(__file__)))))
include = pathlib.Path(os.path.join(monorepo_root, 'libcxx', 'include')) include = pathlib.Path(os.path.join(monorepo_root, 'libcxx', 'include'))
test = pathlib.Path(os.path.join(monorepo_root, 'libcxx', 'test')) test = pathlib.Path(os.path.join(monorepo_root, 'libcxx', 'test'))
assert(monorepo_root.exists()) assert(monorepo_root.exists())
toplevel_headers = sorted(str(p.relative_to(include)) for p in include.glob('[a-z]*') if is_header(p)) 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)) 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
public_headers = toplevel_headers + experimental_headers + extended_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')) 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 = { variables = {
'toplevel_headers': toplevel_headers, 'toplevel_headers': toplevel_headers,
'experimental_headers': experimental_headers, 'experimental_headers': experimental_headers,
'extended_headers': extended_headers,
'public_headers': public_headers, 'public_headers': public_headers,
'private_headers': private_headers, 'private_headers': private_headers,
'header_restrictions': header_restrictions, 'header_restrictions': header_restrictions,
'private_headers_still_public_in_modules': private_headers_still_public_in_modules 'private_headers_still_public_in_modules': private_headers_still_public_in_modules
} }
produce(test.joinpath('libcxx/assertions/headers_declare_verbose_abort.sh.cpp'), variables) produce(test.joinpath('libcxx/assertions/headers_declare_verbose_abort.sh.cpp'), variables)
produce(test.joinpath('libcxx/clang_tidy.sh.cpp'), variables) produce(test.joinpath('libcxx/clang_tidy.sh.cpp'), variables)
Show All 11 Lines