This is an archive of the discontinued LLVM Phabricator instance.

Differential D137278

[libc++][test] Fixes transitive includes.
ClosedPublic

Authored by Mordante on Nov 2 2022, 11:45 AM.

Details

Reviewers
philnik
Group Reviewers
Restricted Project
Commits
rGc7576cb89d6c: [libc++][test] Fixes transitive includes.
Summary

These were accidentally set to generating in
243da90ea5357c1ca324f714ea4813dc9029af27

Diff Detail

Event Timeline

Mordante created this revision.Nov 2 2022, 11:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 2 2022, 11:45 AM
Mordante requested review of this revision.Nov 2 2022, 11:45 AM
Herald added a project: Restricted Project. · View Herald TranscriptNov 2 2022, 11:45 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
Harbormaster completed remote builds in B195774: Diff 472714.Nov 2 2022, 11:52 AM
Mordante updated this revision to Diff 472721.Nov 2 2022, 12:08 PM

Regenerate files.

philnik accepted this revision.Nov 2 2022, 12:17 PM
This revision is now accepted and ready to land.Nov 2 2022, 12:17 PM
Harbormaster completed remote builds in B195779: Diff 472721.Nov 2 2022, 1:44 PM
Closed by commit rGc7576cb89d6c: [libc++][test] Fixes transitive includes. (authored by Mordante). · Explain WhyNov 2 2022, 2:12 PM
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rGc7576cb89d6c: [libc++][test] Fixes transitive includes..
Mordante mentioned this in D137283: [libc++] Granularize <concept> includes.Nov 2 2022, 2:19 PM

Revision Contents

PathSize
libcxx/
test/
libcxx/
5 lines
transitive_includes/
1 line
1 line
1 line
1 line

Diff 472758

libcxx/test/libcxx/transitive_includes.sh.cpp

Show First 20 Lines • Show All 46 Lines • ▼ Show 20 Lines
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++:
# for std in c++03 c++11 c++14 c++17 c++20 c++2b; do <build>/bin/llvm-lit --param std=$std ${path_to_this_file}; done # for std in c++03 c++11 c++14 c++17 c++20 c++2b; do <build>/bin/llvm-lit --param std=$std ${path_to_this_file}; done
regenerate_expected_results = True regenerate_expected_results = False
# Used because the sequence of tokens RUN : can't appear anywhere or it'll confuse Lit. # Used because the sequence of tokens RUN : can't appear anywhere or it'll confuse Lit.
RUN = "RUN" RUN = "RUN"
print(f"// {RUN}: mkdir %t") print(f"// {RUN}: mkdir %t")
for i, header in enumerate(public_headers): for i, header in enumerate(public_headers):
if header.endswith('.h'): # Skip C compatibility or detail headers if header.endswith('.h'): # Skip C compatibility or detail headers
continue continue
▲ Show 20 Lines • Show All 491 Lines • ▼ Show 20 Lines
// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_139 2> %t/header.ext_hash_map // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_139 2> %t/header.ext_hash_map
#if defined(TEST_139) #if defined(TEST_139)
#include <ext/hash_map> #include <ext/hash_map>
#endif #endif
// RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_140 2> %t/header.ext_hash_set // RUN: %{cxx} %s %{flags} %{compile_flags} --trace-includes -fshow-skipped-includes -fsyntax-only -DTEST_140 2> %t/header.ext_hash_set
#if defined(TEST_140) #if defined(TEST_140)
#include <ext/hash_set> #include <ext/hash_set>
#endif #endif
// RUN: %{python} %S/transitive_includes_to_csv.py %t > %S/transitive_includes/%{cxx_std}.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
// GENERATED-MARKER // GENERATED-MARKER

libcxx/test/libcxx/transitive_includes/cxx03.csv

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines
charconv cstdint charconv cstdint
charconv cstdlib charconv cstdlib
charconv cstring charconv cstring
charconv initializer_list charconv initializer_list
charconv iosfwd charconv iosfwd
charconv limits charconv limits
charconv type_traits charconv type_traits
chrono compare chrono compare
chrono cstdint
chrono ctime chrono ctime
chrono limits chrono limits
chrono ratio chrono ratio
chrono type_traits chrono type_traits
chrono version chrono version
cinttypes cstdint cinttypes cstdint
cmath type_traits cmath type_traits
cmath version cmath version
▲ Show 20 Lines • Show All 821 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx11.csv

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines
charconv cstdint charconv cstdint
charconv cstdlib charconv cstdlib
charconv cstring charconv cstring
charconv initializer_list charconv initializer_list
charconv iosfwd charconv iosfwd
charconv limits charconv limits
charconv type_traits charconv type_traits
chrono compare chrono compare
chrono cstdint
chrono ctime chrono ctime
chrono limits chrono limits
chrono ratio chrono ratio
chrono type_traits chrono type_traits
chrono version chrono version
cinttypes cstdint cinttypes cstdint
cmath type_traits cmath type_traits
cmath version cmath version
▲ Show 20 Lines • Show All 822 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx14.csv

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines
charconv cstdint charconv cstdint
charconv cstdlib charconv cstdlib
charconv cstring charconv cstring
charconv initializer_list charconv initializer_list
charconv iosfwd charconv iosfwd
charconv limits charconv limits
charconv type_traits charconv type_traits
chrono compare chrono compare
chrono cstdint
chrono ctime chrono ctime
chrono limits chrono limits
chrono ratio chrono ratio
chrono type_traits chrono type_traits
chrono version chrono version
cinttypes cstdint cinttypes cstdint
cmath type_traits cmath type_traits
cmath version cmath version
▲ Show 20 Lines • Show All 830 Lines • Show Last 20 Lines

libcxx/test/libcxx/transitive_includes/cxx17.csv

Show First 20 Lines • Show All 101 Lines • ▼ Show 20 Lines
charconv cstdint charconv cstdint
charconv cstdlib charconv cstdlib
charconv cstring charconv cstring
charconv initializer_list charconv initializer_list
charconv iosfwd charconv iosfwd
charconv limits charconv limits
charconv type_traits charconv type_traits
chrono compare chrono compare
chrono cstdint
chrono ctime chrono ctime
chrono limits chrono limits
chrono ratio chrono ratio
chrono type_traits chrono type_traits
chrono version chrono version
cinttypes cstdint cinttypes cstdint
cmath type_traits cmath type_traits
cmath version cmath version
▲ Show 20 Lines • Show All 830 Lines • Show Last 20 Lines