diff options
author | Chandler Carruth <chandlerc@gmail.com> | 2012-02-21 22:21:50 +0000 |
---|---|---|
committer | Chandler Carruth <chandlerc@gmail.com> | 2012-02-21 22:21:50 +0000 |
commit | e3bab98b2c024d6886af16651fa0f9e53f939bf6 (patch) | |
tree | 105c88f8c17be9ab89c95f43cd400a35aaa09426 | |
parent | 6ce2341545ad74e5989048a58163ecf9da77aae9 (diff) |
Skip testing the crtbegin.o, and resume using a single variable for the
prefixes. It seems only crtbegin.o uses the strange formatting.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@151094 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | test/Driver/gcc-toolchain.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/Driver/gcc-toolchain.cpp b/test/Driver/gcc-toolchain.cpp index 5529a5dc9a..e122dac9b9 100644 --- a/test/Driver/gcc-toolchain.cpp +++ b/test/Driver/gcc-toolchain.cpp @@ -14,10 +14,10 @@ // CHECK: "[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5/backward" // 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. +// Test for linker toolchain detection. Note that only the '-L' flags will use +// the same precise formatting of the path as the '-internal-system' flags +// above, so we just blanket wildcard match the 'crtbegin.o'. // CHECK: "{{[^"]*}}ld{{(.exe)?}}" -// 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/../../../.." +// CHECK: "{{[^"]*}}/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/crtbegin.o" +// CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5" +// CHECK: "-L[[TOOLCHAIN]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../.." |