This is an archive of the discontinued LLVM Phabricator instance.

Differential D103475

[libc++] Fix the std_include.sh.cpp test that has been failing since c9385297ce
ClosedPublic

Authored by ldionne on Jun 1 2021, 10:59 AM.

Details

Reviewers
• Quuxplusone
Group Reviewers
Restricted Project
Commits
rGba95fa03ce26: [libc++] Fix the std_include.sh.cpp test that has been failing since c9385297ce
Summary

The compiler used on Apple bots doesn't know about -std=c++20 yet, so
we can't use that just yet.

Diff Detail

Event Timeline

ldionne requested review of this revision.Jun 1 2021, 10:59 AM
ldionne created this revision.
Herald added a project: Restricted Project. · View Herald TranscriptJun 1 2021, 10:59 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
• Quuxplusone accepted this revision.Jun 1 2021, 11:09 AM

(Whoops!) Ship it.

This revision is now accepted and ready to land.Jun 1 2021, 11:09 AM
Harbormaster completed remote builds in B107078: Diff 349024.Jun 1 2021, 12:28 PM
Closed by commit rGba95fa03ce26: [libc++] Fix the std_include.sh.cpp test that has been failing since c9385297ce (authored by ldionne). · Explain WhyJun 1 2021, 1:32 PM
This revision was automatically updated to reflect the committed changes.
ldionne added a commit: rGba95fa03ce26: [libc++] Fix the std_include.sh.cpp test that has been failing since c9385297ce.

Revision Contents

PathSize
libcxx/
test/
libcxx/
modules/
5 lines

Diff 349089

libcxx/test/libcxx/modules/stds_include.sh.cpp

Show All 9 Lines
// enabled in various Standard modes. This is a common source of breakage // enabled in various Standard modes. This is a common source of breakage
// since the 'std' module will include all headers, so if something in a // since the 'std' module will include all headers, so if something in a
// header fails under a standard mode, importing anything will fail. // header fails under a standard mode, importing anything will fail.
// This test fails on Windows because the underlying libc headers on Windows // This test fails on Windows because the underlying libc headers on Windows
// are not modular // are not modular
// XFAIL: LIBCXX-WINDOWS-FIXME // XFAIL: LIBCXX-WINDOWS-FIXME
// TEMPORARY HACK UNTIL WE FIGURE OUT WHAT THE ISSUE IS TO AVOID BREAKING ALL CI
// UNSUPPORTED: apple-clang
// Some headers are not available when these features are disabled, but they // Some headers are not available when these features are disabled, but they
// still get built as part of the 'std' module, which breaks the build. // still get built as part of the 'std' module, which breaks the build.
// UNSUPPORTED: libcpp-has-no-threads // UNSUPPORTED: libcpp-has-no-threads
// UNSUPPORTED: libcpp-has-no-localization // UNSUPPORTED: libcpp-has-no-localization
// UNSUPPORTED: libcpp-has-no-filesystem-library // UNSUPPORTED: libcpp-has-no-filesystem-library
// REQUIRES: modules-support // REQUIRES: modules-support
// NOTE: The -std=XXX flag is present in %{flags}, so we overwrite it by passing it after %{flags}. // NOTE: The -std=XXX flag is present in %{flags}, so we overwrite it by passing it after %{flags}.
// FIXME: Remove the `-DINVALIDATE_CACHE_FOO` macros. Their purpose is to workaround a bug in older Clang versions // FIXME: Remove the `-DINVALIDATE_CACHE_FOO` macros. Their purpose is to workaround a bug in older Clang versions
// the same modules caches were reused across standard dialects. // the same modules caches were reused across standard dialects.
// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++03 -DINVALIDATE_CACHE_CXX03 %s // RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++03 -DINVALIDATE_CACHE_CXX03 %s
// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++11 -DINVALIDATE_CACHE_CXX11 %s // RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++11 -DINVALIDATE_CACHE_CXX11 %s
// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++14 -DINVALIDATE_CACHE_CXX14 %s // RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++14 -DINVALIDATE_CACHE_CXX14 %s
// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++17 -DINVALIDATE_CACHE_CXX17 %s // RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++17 -DINVALIDATE_CACHE_CXX17 %s
// RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++20 -DINVALIDATE_CACHE_CXX20 %s // RUN: %{cxx} %{flags} %{compile_flags} -fmodules -fcxx-modules -fsyntax-only -std=c++2a -DINVALIDATE_CACHE_CXX20 %s
#include <vector> #include <vector>
int main(int, char**) { int main(int, char**) {
return 0; return 0;
} }