diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2012-01-24 01:55:55 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2012-01-24 01:55:55 +0000 |
| commit | 0259042fd77da3532b87327ffe9f7e330222d72c (patch) | |
| tree | 34b6e684e9e4933077e1add686df84c780cc4eea | |
| parent | 69b26d653829efe834eb18800f9ff33dff64beb4 (diff) | |
Make driver tests more resilient to output trees containing symlinks --
the tests are making assertions about the name of the clang binary, so
we should ensure that the name is as stable as possible.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@148767 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | test/Driver/dragonfly.c | 2 | ||||
| -rw-r--r-- | test/Driver/freebsd.c | 4 | ||||
| -rw-r--r-- | test/Driver/openbsd.c | 2 | ||||
| -rw-r--r-- | test/Driver/pth.c | 4 | ||||
| -rw-r--r-- | test/Driver/rewrite-objc.m | 2 |
5 files changed, 7 insertions, 7 deletions
diff --git a/test/Driver/dragonfly.c b/test/Driver/dragonfly.c index 1a83f6c7f1..8a629da817 100644 --- a/test/Driver/dragonfly.c +++ b/test/Driver/dragonfly.c @@ -1,4 +1,4 @@ -// RUN: %clang -target amd64-pc-dragonfly %s -### 2> %t.log +// RUN: %clang -no-canonical-prefixes -target amd64-pc-dragonfly %s -### 2> %t.log // RUN: FileCheck -input-file %t.log %s // CHECK: clang{{.*}}" "-cc1" "-triple" "amd64-pc-dragonfly" diff --git a/test/Driver/freebsd.c b/test/Driver/freebsd.c index 9b4820380a..7b10f77102 100644 --- a/test/Driver/freebsd.c +++ b/test/Driver/freebsd.c @@ -1,4 +1,4 @@ -// RUN: %clang -ccc-clang-archs "" -target powerpc64-pc-freebsd8 %s -### 2> %t +// RUN: %clang -no-canonical-prefixes -ccc-clang-archs "" -target powerpc64-pc-freebsd8 %s -### 2> %t // RUN: FileCheck --check-prefix=CHECK-PPC < %t %s // // CHECK-PPC: clang{{.*}}" "-cc1" "-triple" "powerpc64-pc-freebsd8" @@ -7,7 +7,7 @@ // Check that -m32 properly adjusts the toolchain flags. // -// RUN: %clang -target x86_64-pc-freebsd8 -m32 -### %s 2> %t +// RUN: %clang -no-canonical-prefixes -target x86_64-pc-freebsd8 -m32 -### %s 2> %t // RUN: FileCheck --check-prefix=CHECK-LIB32 < %t %s // // CHECK-LIB32: clang{{.*}}" "-cc1" "-triple" "i386-pc-freebsd8" diff --git a/test/Driver/openbsd.c b/test/Driver/openbsd.c index 65f4574ecc..911c452c6c 100644 --- a/test/Driver/openbsd.c +++ b/test/Driver/openbsd.c @@ -1,4 +1,4 @@ -// RUN: %clang -ccc-clang-archs "" -target i686-pc-openbsd %s -### 2> %t.log +// RUN: %clang -no-canonical-prefixes -ccc-clang-archs "" -target i686-pc-openbsd %s -### 2> %t.log // RUN: FileCheck -input-file %t.log %s // CHECK: clang{{.*}}" "-cc1" "-triple" "i686-pc-openbsd" diff --git a/test/Driver/pth.c b/test/Driver/pth.c index 9c47c55993..4350f46e86 100644 --- a/test/Driver/pth.c +++ b/test/Driver/pth.c @@ -1,12 +1,12 @@ // Test transparent PTH support. -// RUN: %clang -ccc-pch-is-pth -x c-header %s -o %t.h.pth -### 2> %t.log +// RUN: %clang -no-canonical-prefixes -ccc-pch-is-pth -x c-header %s -o %t.h.pth -### 2> %t.log // RUN: FileCheck -check-prefix CHECK1 -input-file %t.log %s // CHECK1: "{{.*}}/clang{{.*}}" "-cc1" {{.*}} "-o" "{{.*}}.h.pth" "-x" "c-header" "{{.*}}pth.c" // RUN: touch %t.h.pth -// RUN: %clang -ccc-pch-is-pth -E -include %t.h %s -### 2> %t.log +// RUN: %clang -no-canonical-prefixes -ccc-pch-is-pth -E -include %t.h %s -### 2> %t.log // RUN: FileCheck -check-prefix CHECK2 -input-file %t.log %s // CHECK2: "{{.*}}/clang{{.*}}" "-cc1" {{.*}}"-include-pth" "{{.*}}.h.pth" {{.*}}"-x" "c" "{{.*}}pth.c" diff --git a/test/Driver/rewrite-objc.m b/test/Driver/rewrite-objc.m index b2dca860ec..c1336acad6 100644 --- a/test/Driver/rewrite-objc.m +++ b/test/Driver/rewrite-objc.m @@ -1,4 +1,4 @@ -// RUN: %clang -target x86_64-apple-macosx10.7.0 -rewrite-objc %s -o - -### 2>&1 | \ +// RUN: %clang -no-canonical-prefixes -target x86_64-apple-macosx10.7.0 -rewrite-objc %s -o - -### 2>&1 | \ // RUN: FileCheck -check-prefix=TEST0 %s // TEST0: clang{{.*}}" "-cc1" // TEST0: "-rewrite-objc" |