This is an archive of the discontinued LLVM Phabricator instance.

Differential D65841

[Driver] Switch -stdlib++-isystem test to -###-verbatim
AcceptedPublic

Authored by smeenai on Aug 6 2019, 6:20 PM.

Details

Reviewers
compnerd
phosek
rnk
Summary

This allows the test to pass on Windows and avoid backslash quoting
issues.

Diff Detail

Event Timeline

smeenai created this revision.Aug 6 2019, 6:20 PM
Herald added a project: Restricted Project. · View Herald TranscriptAug 6 2019, 6:20 PM
Herald added a subscriber: cfe-commits. · View Herald Transcript
Harbormaster completed remote builds in B36290: Diff 213774.Aug 6 2019, 6:20 PM
Herald added a subscriber: ormris. · View Herald TranscriptAug 6 2019, 6:20 PM
smeenai added a parent revision: D65839: [Driver] Add verbatim dry run option.Aug 6 2019, 6:21 PM
phosek accepted this revision.Sep 23 2019, 2:08 PM

LGTM

This revision is now accepted and ready to land.Sep 23 2019, 2:08 PM

Revision Contents

PathSize
clang/
test/
Driver/
39 lines

Diff 213774

clang/test/Driver/stdlibxx-isystem.cpp

// Backslash escaping makes matching against the installation directory fail on
// Windows. Temporarily disable the test there until we add an option to print
// the installation directory unescaped.
// UNSUPPORTED: system-windows
// By default, we should search for libc++ next to the driver. // By default, we should search for libc++ next to the driver.
// RUN: mkdir -p %t/bin // RUN: mkdir -p %t/bin
// RUN: mkdir -p %t/include/c++/v1 // RUN: mkdir -p %t/include/c++/v1
// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ // RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \
// RUN: -stdlib=libc++ -fsyntax-only %s -### 2>&1 | \ // RUN: -stdlib=libc++ -fsyntax-only %s -###-verbatim | \
// RUN: FileCheck -check-prefix=LIBCXX %s // RUN: FileCheck -check-prefix=LIBCXX %s
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ // RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \
// RUN: -stdlib=libc++ -fsyntax-only %s -### 2>&1 | \ // RUN: -stdlib=libc++ -fsyntax-only %s -###-verbatim | \
// RUN: FileCheck -check-prefix=LIBCXX %s // RUN: FileCheck -check-prefix=LIBCXX %s
// LIBCXX: InstalledDir: [[INSTALLDIR:.+$]] // LIBCXX: InstalledDir: [[INSTALLDIR:.+$]]
// LIBCXX: "-internal-isystem" "[[INSTALLDIR]]/../include/c++/v1" // LIBCXX: -internal-isystem [[INSTALLDIR]]/../include/c++/v1
// Passing -stdlib++-isystem should suppress the default search. // Passing -stdlib++-isystem should suppress the default search.
// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ // RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \
// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \ // RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \
// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=NODEFAULT %s // RUN: -fsyntax-only %s -###-verbatim | FileCheck -check-prefix=NODEFAULT %s
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ // RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \
// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \ // RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \
// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=NODEFAULT %s // RUN: -fsyntax-only %s -###-verbatim | FileCheck -check-prefix=NODEFAULT %s
// NODEFAULT: InstalledDir: [[INSTALLDIR:.+$]] // NODEFAULT: InstalledDir: [[INSTALLDIR:.+$]]
// NODEFAULT-NOT: "-internal-isystem" "[[INSTALLDIR]]/../include/c++/v1" // NODEFAULT-NOT: -internal-isystem [[INSTALLDIR]]/../include/c++/v1
// And we should add it as an -internal-isystem. // And we should add it as an -internal-isystem.
// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ // RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \
// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \ // RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \
// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=INCPATH %s // RUN: -fsyntax-only %s -###-verbatim | FileCheck -check-prefix=INCPATH %s
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ // RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \
// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \ // RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -stdlib=libc++ \
// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=INCPATH %s // RUN: -fsyntax-only %s -###-verbatim | FileCheck -check-prefix=INCPATH %s
// INCPATH: "-internal-isystem" "/tmp/foo" "-internal-isystem" "/tmp/bar" // INCPATH: -internal-isystem /tmp/foo -internal-isystem /tmp/bar
// We shouldn't pass the -stdlib++-isystem to cc1. // We shouldn't pass the -stdlib++-isystem to cc1.
// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ // RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \
// RUN: -stdlib++-isystem /tmp -stdlib=libc++ -fsyntax-only %s -### 2>&1 | \ // RUN: -stdlib++-isystem /tmp -stdlib=libc++ -fsyntax-only %s \
// RUN: FileCheck -check-prefix=NOCC1 %s // RUN: -###-verbatim | FileCheck -check-prefix=NOCC1 %s
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ // RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \
// RUN: -stdlib++-isystem /tmp -stdlib=libc++ -fsyntax-only %s -### 2>&1 | \ // RUN: -stdlib++-isystem /tmp -stdlib=libc++ -fsyntax-only %s \
// RUN: FileCheck -check-prefix=NOCC1 %s // RUN: -###-verbatim | FileCheck -check-prefix=NOCC1 %s
// NOCC1-NOT: "-stdlib++-isystem" "/tmp" // NOCC1-NOT: -stdlib++-isystem /tmp
// It should respect -nostdinc++. // It should respect -nostdinc++.
// RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \ // RUN: %clang -target aarch64-linux-android -ccc-install-dir %t/bin \
// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -nostdinc++ \ // RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -nostdinc++ \
// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=NOSTDINCXX %s // RUN: -fsyntax-only %s -###-verbatim | FileCheck -check-prefix=NOSTDINCXX %s
// RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \ // RUN: %clang -target x86_64-apple-darwin -ccc-install-dir %t/bin \
// RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -nostdinc++ \ // RUN: -stdlib++-isystem /tmp/foo -stdlib++-isystem /tmp/bar -nostdinc++ \
// RUN: -fsyntax-only %s -### 2>&1 | FileCheck -check-prefix=NOSTDINCXX %s // RUN: -fsyntax-only %s -###-verbatim | FileCheck -check-prefix=NOSTDINCXX %s
// NOSTDINCXX-NOT: "-internal-isystem" "/tmp/foo" "-internal-isystem" "/tmp/bar" // NOSTDINCXX-NOT: -internal-isystem /tmp/foo -internal-isystem /tmp/bar