[cfe-commits] r134899 - in /cfe/trunk/test: ARCMT/driver-migrate.m Driver/sysroot.c

[NAKAMURA Takumi]

Author: chapuni
Date: Mon Jul 11 11:21:34 2011
New Revision: 134899

URL: http://llvm.org/viewvc/llvm-project?rev=134899&view=rev
Log:
Tweak two tests with MSYS-bash tolerant.

Modified:
    cfe/trunk/test/ARCMT/driver-migrate.m
    cfe/trunk/test/Driver/sysroot.c

Modified: cfe/trunk/test/ARCMT/driver-migrate.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/ARCMT/driver-migrate.m?rev=134899&r1=134898&r2=134899&view=diff
==============================================================================
--- cfe/trunk/test/ARCMT/driver-migrate.m (original)
+++ cfe/trunk/test/ARCMT/driver-migrate.m Mon Jul 11 11:21:34 2011
@@ -1,3 +1,3 @@
 // RUN: %clang -### -ccc-arcmt-migrate /foo/bar -fsyntax-only %s 2>&1 | FileCheck %s
 
-// CHECK: "-arcmt-migrate" "-arcmt-migrate-directory" "/foo/bar"
+// CHECK: "-arcmt-migrate" "-arcmt-migrate-directory" "{{[^"]*}}/foo/bar"

Modified: cfe/trunk/test/Driver/sysroot.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/sysroot.c?rev=134899&r1=134898&r2=134899&view=diff
==============================================================================
--- cfe/trunk/test/Driver/sysroot.c (original)
+++ cfe/trunk/test/Driver/sysroot.c Mon Jul 11 11:21:34 2011
@@ -1,18 +1,18 @@
 // Check that --sysroot= also applies to header search paths.
 // RUN: %clang -ccc-host-triple i386-unk-unk --sysroot=/FOO -### -E %s 2> %t1
 // RUN: FileCheck --check-prefix=CHECK-SYSROOTEQ < %t1 %s
-// CHECK-SYSROOTEQ: "-cc1"{{.*}} "-isysroot" "/FOO"
+// CHECK-SYSROOTEQ: "-cc1"{{.*}} "-isysroot" "{{[^"]*}}/FOO"
 
 // Apple Darwin uses -isysroot as the syslib root, too.
 // RUN: touch %t2.o
 // RUN: %clang -ccc-host-triple i386-apple-darwin10 \
 // RUN:   -isysroot /FOO -### %t2.o 2> %t2
 // RUN: FileCheck --check-prefix=CHECK-APPLE-ISYSROOT < %t2 %s
-// CHECK-APPLE-ISYSROOT: "-arch" "i386"{{.*}} "-syslibroot" "/FOO"
+// CHECK-APPLE-ISYSROOT: "-arch" "i386"{{.*}} "-syslibroot" "{{[^"]*}}/FOO"
 
 // Check that honor --sysroot= over -isysroot, for Apple Darwin.
 // RUN: touch %t3.o
 // RUN: %clang -ccc-host-triple i386-apple-darwin10 \
 // RUN:   -isysroot /FOO --sysroot=/BAR -### %t3.o 2> %t3
 // RUN: FileCheck --check-prefix=CHECK-APPLE-SYSROOT < %t3 %s
-// CHECK-APPLE-SYSROOT: "-arch" "i386"{{.*}} "-syslibroot" "/BAR"
+// CHECK-APPLE-SYSROOT: "-arch" "i386"{{.*}} "-syslibroot" "{{[^"]*}}/BAR"