From: Chandler Carruth Date: Sun, 19 Feb 2012 23:09:50 +0000 (+0000) Subject: Make the regular expressions in this test more narrow to ensure we're X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=607098c45917ff2472822c463eb0a83f99845f07;p=clang Make the regular expressions in this test more narrow to ensure we're actually matching the write substrings, and stop looking for a leading '/' to try and finish fixing darwin and other hosts. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@150938 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/test/Driver/gcc-toolchain.cpp b/test/Driver/gcc-toolchain.cpp index 7361e249a1..f56b11051b 100644 --- a/test/Driver/gcc-toolchain.cpp +++ b/test/Driver/gcc-toolchain.cpp @@ -6,7 +6,7 @@ // RUN: | FileCheck %s // CHECK: "-internal-isystem" -// CHECK: "[[TOOLCHAIN:.*]]/usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5/../../../../../include/c++/4.5" +// 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" @@ -19,8 +19,7 @@ // CHECK: "/include" // CHECK: "-internal-externc-isystem" // CHECK: "/usr/include" -// CHECK: "{{.*}}/ld{{(.exe)?}}" -// CHECK: "{{.*}}crti.o" -// 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: "{{[^"]*}}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/../../../.."