diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2012-02-21 21:51:40 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2012-02-21 21:51:40 +0000 |
commit | 6ce2341545ad74e5989048a58163ecf9da77aae9 (patch) | |
tree | 1379f36091888e571e756a550ca36715f34b0c2b | |
parent | 977ea7864a50eee39f6bef8a5a79154ac9ba4b3e (diff) |
Clean up, add some documentation, and make this test return to checking
the linker toolchainness a bit more thoroughly. It used to work this
way, but hit buildbot issues. Hopefully subsequent fixes have addressed
those problems, but I'll be watching the bots.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151090 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | test/Driver/gcc-toolchain.cpp | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/test/Driver/gcc-toolchain.cpp b/test/Driver/gcc-toolchain.cpp index f56b11051b..5529a5dc9a 100644 --- a/test/Driver/gcc-toolchain.cpp +++ b/test/Driver/gcc-toolchain.cpp @@ -4,22 +4,20 @@ // RUN: -target i386-unknown-linux \ // RUN: -gcc-toolchain %S/Inputs/ubuntu_11.04_multiarch_tree/usr \ // RUN: | FileCheck %s - +// +// Test for header search toolchain detection. // CHECK: "-internal-isystem" // CHECK: "[[TOOLCHAIN:[^"]+]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5" // CHECK: "-internal-isystem" // CHECK: "[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5/i686-linux-gnu" // CHECK: "-internal-isystem" // CHECK: "[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5/backward" -// CHECK: "-internal-isystem" -// CHECK: "/usr/local/include" -// CHECK: "-internal-isystem" -// CHECK: lib/clang/3.1/include" -// CHECK: "-internal-externc-isystem" -// CHECK: "/include" -// CHECK: "-internal-externc-isystem" -// CHECK: "/usr/include" +// CHECK: "-internal-isystem" "/usr/local/include" +// +// Test for linker toolchain detection. Note that we use a separate variable +// because the '/'s may be different in the linker invocation than in the +// header search. // CHECK: "{{[^"]*}}ld{{(.exe)?}}" -// CHECK: "{{[^"]*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/crtbegin.o" -// CHECK: "-L{{[^"]*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5" -// CHECK: "-L{{[^"]*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.." +// CHECK: "[[TOOLCHAIN2:[^"]*]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/crtbegin.o" +// CHECK: "-L[[TOOLCHAIN2]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5" +// CHECK: "-L[[TOOLCHAIN2]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.." |