[cfe-commits] r150938 - /cfe/trunk/test/Driver/gcc-toolchain.cpp

[Chandler Carruth]

Author: chandlerc
Date: Sun Feb 19 17:09:50 2012
New Revision: 150938

URL: http://llvm.org/viewvc/llvm-project?rev=150938&view=rev
Log:
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.

Modified:
    cfe/trunk/test/Driver/gcc-toolchain.cpp

Modified: cfe/trunk/test/Driver/gcc-toolchain.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/gcc-toolchain.cpp?rev=150938&r1=150937&r2=150938&view=diff
==============================================================================
--- cfe/trunk/test/Driver/gcc-toolchain.cpp (original)
+++ cfe/trunk/test/Driver/gcc-toolchain.cpp Sun Feb 19 17:09:50 2012
@@ -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/../../../.."