From 4fc5fcd121921caf338fc9bb898e10ab93a3cc86 Mon Sep 17 00:00:00 2001 From: Chandler Carruth Date: Sun, 19 Feb 2012 23:09:50 +0000 Subject: 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. llvm-svn: 150938 --- clang/test/Driver/gcc-toolchain.cpp | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'clang/test/Driver/gcc-toolchain.cpp') diff --git a/clang/test/Driver/gcc-toolchain.cpp b/clang/test/Driver/gcc-toolchain.cpp index 7361e249a1f..f56b11051b4 100644 --- a/clang/test/Driver/gcc-toolchain.cpp +++ b/clang/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/../../../.." -- cgit v1.2.3