Update tests to use %clang instead of 'clang', and forcibly disable use of '

clang ' or ' clang -cc1 ' or ' clang-cc ' in test lines (by substituting them to
garbage).

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91460 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp b/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp
index 00d109e67516b3f6ffe0d9085ca2b2e92b24226d..1aa163a8d8d7a90ecfe2ed9af9b2e23666375c0c 100644 (file)
--- a/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp
+++ b/test/CXX/dcl.dcl/basic.namespace/namespace.udecl/p10.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify %s
+// RUN: %clang -fsyntax-only -verify %s
 
 namespace test0 {
   namespace ns0 {

diff --git a/test/CodeGen/2009-10-20-GlobalDebug.c b/test/CodeGen/2009-10-20-GlobalDebug.c
index fddc76c14da86028af1fa21ce23793fb471ff7be..f19ceb1e73c18da520031de5f5ed4217ece44e6a 100644 (file)
--- a/test/CodeGen/2009-10-20-GlobalDebug.c
+++ b/test/CodeGen/2009-10-20-GlobalDebug.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-host-triple i386-apple-darwin10 -S -g -dA %s -o - | FileCheck %s
+// RUN: %clang -ccc-host-triple i386-apple-darwin10 -S -g -dA %s -o - | FileCheck %s
 int global;
 // CHECK: asciz  "global"                                    ## DW_AT_name
 int main() { return 0;}

diff --git a/test/CodeGen/always_inline.c b/test/CodeGen/always_inline.c
index d995ea11be09f3d167312d7cc010813427afc6e8..c91fd43f2761cd49adc9dd0e7df63d18f7ea53a1 100644 (file)
--- a/test/CodeGen/always_inline.c
+++ b/test/CodeGen/always_inline.c
@@ -1,7 +1,7 @@
-// RUN: clang -emit-llvm -S -o %t %s
+// RUN: %clang -emit-llvm -S -o %t %s
 // RUN: not grep '@f0' %t
 // RUN: not grep 'call ' %t
-// RUN: clang -mllvm -disable-llvm-optzns -emit-llvm -S -o %t %s
+// RUN: %clang -mllvm -disable-llvm-optzns -emit-llvm -S -o %t %s
 // RUN: grep '@f0' %t | count 2
 
 //static int f0() { 

diff --git a/test/CodeGen/bitfield-promote.c b/test/CodeGen/bitfield-promote.c
index 1290a1ecd33b5d469ea9c825119e4ff6d4c57b82..4c3292c48feb5d094e25d3b3fda97bf106e207e7 100644 (file)
--- a/test/CodeGen/bitfield-promote.c
+++ b/test/CodeGen/bitfield-promote.c
@@ -1,4 +1,4 @@
-// RUN: clang -O3 -emit-llvm -S -o %t %s
+// RUN: %clang -O3 -emit-llvm -S -o %t %s
 // RUN: grep 'ret i64 4294967292' %t | count 2
 // RUN: grep 'ret i64 -4' %t | count 1
 

diff --git a/test/CodeGen/call-knr-indirect.c b/test/CodeGen/call-knr-indirect.c
index 17be015bffb19c1f96c8cc533570becbc20d8718..2e923b303cd0cc076fee20d728574b65bb2d0448 100644 (file)
--- a/test/CodeGen/call-knr-indirect.c
+++ b/test/CodeGen/call-knr-indirect.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -O0 -emit-llvm -S -o - | grep 'call.*rb_define_global_function'
+// RUN: %clang %s -O0 -emit-llvm -S -o - | grep 'call.*rb_define_global_function'
 // This should call rb_define_global_function, not rb_f_chop.
 
 void rb_define_global_function (const char*,void(*)(),int);

diff --git a/test/CodeGen/illegal-UTF8.m b/test/CodeGen/illegal-UTF8.m
index a9d5a37ac75709c3c2d57def92e0f944df302920..871e6e5956a8575d4114374c95774b894eb83ddd 100644 (file)
--- a/test/CodeGen/illegal-UTF8.m
+++ b/test/CodeGen/illegal-UTF8.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -S -m64 -o -
+// RUN: %clang %s -S -m64 -o -
 
 @class NSString;
 

diff --git a/test/CodeGen/inline.c b/test/CodeGen/inline.c
index 76d90eda2100b6fb544b5bde11367ab00fd19f45..a17b06992968834faa5717aa9123974849835d54 100644 (file)
--- a/test/CodeGen/inline.c
+++ b/test/CodeGen/inline.c
@@ -1,5 +1,5 @@
 // RUN: echo "GNU89 tests:"
-// RUN: clang %s -emit-llvm -S -o %t -std=gnu89
+// RUN: %clang %s -emit-llvm -S -o %t -std=gnu89
 // RUN: grep "define available_externally i32 @ei()" %t
 // RUN: grep "define i32 @foo()" %t
 // RUN: grep "define i32 @bar()" %t
@@ -14,7 +14,7 @@
 // RUN: grep "define available_externally i32 @test5" %t
 
 // RUN: echo "\nC99 tests:"
-// RUN: clang %s -emit-llvm -S -o %t -std=c99
+// RUN: %clang %s -emit-llvm -S -o %t -std=c99
 // RUN: grep "define i32 @ei()" %t
 // RUN: grep "define available_externally i32 @foo()" %t
 // RUN: grep "define i32 @bar()" %t
@@ -29,7 +29,7 @@
 // RUN: grep "define available_externally i32 @test5" %t
 
 // RUN: echo "\nC++ tests:"
-// RUN: clang %s -emit-llvm -S -o %t -std=c++98
+// RUN: %clang %s -emit-llvm -S -o %t -std=c++98
 // RUN: grep "define linkonce_odr i32 @_Z2eiv()" %t
 // RUN: grep "define linkonce_odr i32 @_Z3foov()" %t
 // RUN: grep "define i32 @_Z3barv()" %t

diff --git a/test/CodeGen/lineno-dbginfo.c b/test/CodeGen/lineno-dbginfo.c
index b78dd21d72b395fb16f553e582651c5d834b29be..c5c350f7009e71b231b6a7b9f9b2985500741b41 100644 (file)
--- a/test/CodeGen/lineno-dbginfo.c
+++ b/test/CodeGen/lineno-dbginfo.c
@@ -1,5 +1,5 @@
 // RUN: echo "#include <stdio.h>" > %t.h
-// RUN: clang -S -save-temps -g -include %t.h %s -emit-llvm -o %t.ll
+// RUN: %clang -S -save-temps -g -include %t.h %s -emit-llvm -o %t.ll
 // RUN: grep "i32 5" %t.ll
 // RUN: rm -f lineno-dbginfo.i
 // outer is at line number 5.

diff --git a/test/CodeGen/no-common.c b/test/CodeGen/no-common.c
index 64e37d78f96462f02e37bbaf7cf6fda09e24a017..03a5bb064c31d84bea269af0913399ec57493ac4 100644 (file)
--- a/test/CodeGen/no-common.c
+++ b/test/CodeGen/no-common.c
@@ -1,6 +1,6 @@
-// RUN: clang -emit-llvm -S -o %t %s
+// RUN: %clang -emit-llvm -S -o %t %s
 // RUN: grep '@x = common global' %t
-// RUN: clang -fno-common -emit-llvm -S -o %t %s
+// RUN: %clang -fno-common -emit-llvm -S -o %t %s
 // RUN: grep '@x = global' %t
 
 int x;

diff --git a/test/CodeGenCXX/constructor-convert.cpp b/test/CodeGenCXX/constructor-convert.cpp
index 6fa6d556dc502ea500c7b982359620fddaed2f71..7de07724bf17fbcedcac09514de17178d1140f32 100644 (file)
--- a/test/CodeGenCXX/constructor-convert.cpp
+++ b/test/CodeGenCXX/constructor-convert.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -S -o - %s
+// RUN: %clang -emit-llvm -S -o - %s
 
 // PR5775
 class Twine {

diff --git a/test/CodeGenObjC/attr-strong.c b/test/CodeGenObjC/attr-strong.c
index ca83334494350c2a42f63d8e309e1c68c563fcb3..f1474bc93eb590cccedc58a3727777372c7cf987 100644 (file)
--- a/test/CodeGenObjC/attr-strong.c
+++ b/test/CodeGenObjC/attr-strong.c
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -S -o %t %s
+// RUN: %clang -emit-llvm -S -o %t %s
 
 struct s0 {
   void *a;

diff --git a/test/Coverage/targets.c b/test/Coverage/targets.c
index 17d96d88c1b14bc215deb19ae9b38f26b3fbc1ab..c9f6f8d88d5931081bedd3bbc0e2024ab9939876 100644 (file)
--- a/test/Coverage/targets.c
+++ b/test/Coverage/targets.c
@@ -18,5 +18,5 @@
 // RUN: %clang_cc1 -g -triple x86_64-unknown-unknown -emit-llvm -o %t %s
 
 // <rdar://problem/7181838> clang 1.0 fails to compile Python 2.6
-// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -mmacosx-version-min=10.4
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -mmacosx-version-min=10.4
 

diff --git a/test/Driver/Xarch.c b/test/Driver/Xarch.c
index ba6f5c63d4d4b86a329fb408b6a7ee54adbc3eac..b35bf6c92dffc4bd7a75e62389937e9e4bc87863 100644 (file)
--- a/test/Driver/Xarch.c
+++ b/test/Driver/Xarch.c
@@ -1,9 +1,9 @@
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -m32 -Xarch_i386 -O2 %s -S -### 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -m32 -Xarch_i386 -O2 %s -S -### 2> %t.log
 // RUN: grep ' "-O2" ' %t.log | count 1
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -m64 -Xarch_i386 -O2 %s -S -### 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -m64 -Xarch_i386 -O2 %s -S -### 2> %t.log
 // RUN: grep ' "-O2" ' %t.log | count 0
 // RUN: grep "argument unused during compilation: '-Xarch_i386 -O2'" %t.log
-// RUN: not clang -ccc-host-triple i386-apple-darwin9 -m32 -Xarch_i386 -o -Xarch_i386 -S %s -S -Xarch_i386 -o 2> %t.log
+// RUN: not %clang -ccc-host-triple i386-apple-darwin9 -m32 -Xarch_i386 -o -Xarch_i386 -S %s -S -Xarch_i386 -o 2> %t.log
 // RUN: grep "error: invalid Xarch argument: '-Xarch_i386 -o'" %t.log | count 2
 // RUN: grep "error: invalid Xarch argument: '-Xarch_i386 -S'" %t.log
 

diff --git a/test/Driver/analyze.c b/test/Driver/analyze.c
index bdbfbbfd88dd2f1e9a74f1e53838990378c4d09e..2f850bc73ddee1bf728f22c1690f39ae7327ab4b 100644 (file)
--- a/test/Driver/analyze.c
+++ b/test/Driver/analyze.c
@@ -1,7 +1,7 @@
 // Verify that the analyzer gets the same flags as normal compilation
 // (at least for a few key ones).
 
-// RUN: env MACOSX_DEPLOYMENT_TARGET=10.5 clang -ccc-host-triple i386-apple-darwin9  -### --analyze -o /dev/null %s -msse 2> %t.log
+// RUN: env MACOSX_DEPLOYMENT_TARGET=10.5 %clang -ccc-host-triple i386-apple-darwin9  -### --analyze -o /dev/null %s -msse 2> %t.log
 // RUN: FileCheck --input-file=%t.log %s
 
 // CHECK: "-analyze"

diff --git a/test/Driver/arm-darwin-builtin.c b/test/Driver/arm-darwin-builtin.c
index 63cf34332ae1f655c382153886c5d17329aa8c19..9d4cee0f05e31a22d301db135a338c7f0ccefe77 100644 (file)
--- a/test/Driver/arm-darwin-builtin.c
+++ b/test/Driver/arm-darwin-builtin.c
@@ -8,7 +8,7 @@
 // RUX: not grep -- "-fno-builtin-strcat" %t &&
 // RUX: not grep -- "-fno-builtin-strcpy" %t &&
 
-// RUN: clang -ccc-no-clang -ccc-host-triple x86_64-apple-darwin9 -arch arm -### -fsyntax-only %s -fbuiltin-strcat -fbuiltin-strcpy 2> %t
+// RUN: %clang -ccc-no-clang -ccc-host-triple x86_64-apple-darwin9 -arch arm -### -fsyntax-only %s -fbuiltin-strcat -fbuiltin-strcpy 2> %t
 // RUN: not grep -- "-fno-builtin-strcat" %t
 // RUN: not grep -- "-fno-builtin-strcpy" %t
 

diff --git a/test/Driver/ast.c b/test/Driver/ast.c
index fd38c108b0514f4f9ef997a484b54cecefe7c435..6e5857fba5e32984f204a364ebd0cd7bbd0f3ac3 100644 (file)
--- a/test/Driver/ast.c
+++ b/test/Driver/ast.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -emit-ast %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -emit-ast %s 2> %t
 // RUN: echo 'END' >> %t
 // RUN: FileCheck -check-prefix EMIT-AST-PHASES -input-file %t %s
 
@@ -10,7 +10,7 @@
 // EMIT-AST-PHASES: END
 
 // RUN: touch %t.ast
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -c %t.ast 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -c %t.ast 2> %t
 // RUN: echo 'END' >> %t
 // RUN: FileCheck -check-prefix COMPILE-AST-PHASES -input-file %t %s
 

diff --git a/test/Driver/bindings.c b/test/Driver/bindings.c
index 41d6a7ced1759d8475b1bd1823c4f473d2e8bb97..2271ab5c645917ce6be1c46d44ddffcf5f716f74 100644 (file)
--- a/test/Driver/bindings.c
+++ b/test/Driver/bindings.c
@@ -1,54 +1,54 @@
 // Basic binding.
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings %s 2> %t
 // RUN: grep '"clang", inputs: \[".*bindings.c"\], output: ".*\.s"' %t
 // RUN: grep '"gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t
 // RUN: grep '"gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t
 
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang %s 2> %t
 // RUN: grep '"gcc::Compile", inputs: \[".*bindings.c"\], output: ".*\.s"' %t
 // RUN: grep '"gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t
 // RUN: grep '"gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t
 
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp %s 2> %t
 // RUN: grep '"gcc::Preprocess", inputs: \[".*bindings.c"\], output: ".*\.i"' %t
 // RUN: grep '"gcc::Compile", inputs: \[".*\.i"\], output: ".*\.s"' %t
 // RUN: grep '"gcc::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t
 // RUN: grep '"gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t
 
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp -pipe %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -no-integrated-cpp -pipe %s 2> %t
 // RUN: grep '"gcc::Preprocess", inputs: \[".*bindings.c"\], output: (pipe)' %t
 // RUN: grep '"gcc::Compile", inputs: \[(pipe)\], output: (pipe)' %t
 // RUN: grep '"gcc::Assemble", inputs: \[(pipe)\], output: ".*\.o"' %t
 // RUN: grep '"gcc::Link", inputs: \[".*\.o"\], output: "a.out"' %t
 
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -x c-header %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -x c-header %s 2> %t
 // RUN: grep '"gcc::Precompile", inputs: \[".*bindings.c"\], output: ".*bindings.c.gch' %t
 
 // Clang control options
 
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -fsyntax-only %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -fsyntax-only %s 2> %t
 // RUN: grep '"clang", inputs: \[".*bindings.c"\], output: (nothing)' %t
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -fsyntax-only %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang -fsyntax-only %s 2> %t
 // RUN: grep '"gcc::Compile", inputs: \[".*bindings.c"\], output: (nothing)' %t
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cxx -fsyntax-only -x c++ %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cxx -fsyntax-only -x c++ %s 2> %t
 // RUN: grep '"gcc::Compile", inputs: \[".*bindings.c"\], output: (nothing)' %t
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-clang-cxx -fsyntax-only -x c++ %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-clang-cxx -fsyntax-only -x c++ %s 2> %t
 // RUN: grep '"clang", inputs: \[".*bindings.c"\], output: (nothing)' %t
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cpp -fsyntax-only -no-integrated-cpp %s 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-bindings -ccc-no-clang-cpp -fsyntax-only -no-integrated-cpp %s 2> %t
 // RUN: grep '"gcc::Preprocess", inputs: \[".*bindings.c"\], output: ".*\.i"' %t
 // RUN: grep '"clang", inputs: \[".*\.i"\], output: (nothing)' %t
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs i386 %s -S -arch ppc 2> %t
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs i386 %s -S -arch ppc 2> %t
 // RUN: grep '"gcc::Compile", inputs: \[".*bindings.c"\], output: "bindings.s"' %t
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs powerpc %s -S -arch ppc 2> %t
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings -ccc-clang-archs powerpc %s -S -arch ppc 2> %t
 // RUN: grep '"clang", inputs: \[".*bindings.c"\], output: "bindings.s"' %t
 
-// RUN: clang -ccc-host-triple powerpc-unknown-unknown -ccc-print-bindings -ccc-clang-archs "" %s -S 2> %t
+// RUN: %clang -ccc-host-triple powerpc-unknown-unknown -ccc-print-bindings -ccc-clang-archs "" %s -S 2> %t
 // RUN: grep '"clang", inputs: \[".*bindings.c"\], output: "bindings.s"' %t
-// RUN: clang -ccc-host-triple powerpc-unknown-unknown -ccc-print-bindings -ccc-clang-archs "i386" %s -S 2> %t
+// RUN: %clang -ccc-host-triple powerpc-unknown-unknown -ccc-print-bindings -ccc-clang-archs "i386" %s -S 2> %t
 // RUN: grep '"gcc::Compile", inputs: \[".*bindings.c"\], output: "bindings.s"' %t
 
 // Darwin bindings
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings %s 2> %t
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -ccc-print-bindings %s 2> %t
 // RUN: grep '"clang", inputs: \[".*bindings.c"\], output: ".*\.s"' %t
 // RUN: grep '"darwin::Assemble", inputs: \[".*\.s"\], output: ".*\.o"' %t
 // RUN: grep '"darwin::Link", inputs: \[".*\.o"\], output: "a.out"' %t

diff --git a/test/Driver/ccc-add-args.c b/test/Driver/ccc-add-args.c
index afd9bd6f7650e557db3318b791e9dcbdc9790312..d9a16cbfb4605789a0b38f5cec13afe002cece35 100644 (file)
--- a/test/Driver/ccc-add-args.c
+++ b/test/Driver/ccc-add-args.c
@@ -1,4 +1,4 @@
-// RUN: env CCC_ADD_ARGS="-ccc-echo,-ccc-print-options,,-v" clang -### 2>&1 | FileCheck %s
+// RUN: env CCC_ADD_ARGS="-ccc-echo,-ccc-print-options,,-v" %clang -### 2>&1 | FileCheck %s
 // CHECK: Option 0 - Name: "-ccc-echo", Values: {}
 // CHECK: Option 1 - Name: "-ccc-print-options", Values: {}
 // CHECK: Option 2 - Name: "-v", Values: {}

diff --git a/test/Driver/clang-translation.c b/test/Driver/clang-translation.c
index 762ebb7944b22eb9996e3635049c052015d9ea53..8c54c25d49aa99637a26a40a1c78c0f2fef1bcd9 100644 (file)
--- a/test/Driver/clang-translation.c
+++ b/test/Driver/clang-translation.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-host-triple i386-unknown-unknown -### -S -O0 -Os %s -o %t.s -fverbose-asm -funwind-tables -fvisibility=hidden 2> %t.log
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -### -S -O0 -Os %s -o %t.s -fverbose-asm -funwind-tables -fvisibility=hidden 2> %t.log
 // RUN: grep '"-triple" "i386-unknown-unknown"' %t.log
 // RUN: grep '"-S"' %t.log
 // RUN: grep '"-disable-free"' %t.log
@@ -9,12 +9,12 @@
 // RUN: grep '"-o" .*clang-translation.*' %t.log
 // RUN: grep '"-masm-verbose"' %t.log
 // RUN: grep '"-fvisibility" "hidden"' %t.log
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -S %s -o %t.s 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -S %s -o %t.s 2> %t.log
 // RUN: grep '"-mcpu" "yonah"' %t.log
-// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -o %t.s 2> %t.log
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin9 -### -S %s -o %t.s 2> %t.log
 // RUN: grep '"-mcpu" "core2"' %t.log
 
-// RUN: clang -ccc-host-triple x86_64-apple-darwin10 -### -S %s 2> %t.log \
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### -S %s 2> %t.log \
 // RUN:   -arch armv7
 // RUN: FileCheck -check-prefix=ARMV7_DEFAULT %s < %t.log
 // ARMV7_DEFAULT: clang
@@ -24,7 +24,7 @@
 // ARMV7_DEFAULT-NOT: "-msoft-float"
 // ARMV7_DEFAULT: "-x" "c"
 
-// RUN: clang -ccc-host-triple x86_64-apple-darwin10 -### -S %s 2> %t.log \
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### -S %s 2> %t.log \
 // RUN:   -arch armv7 -msoft-float
 // RUN: FileCheck -check-prefix=ARMV7_SOFTFLOAT %s < %t.log
 // ARMV7_SOFTFLOAT: clang
@@ -33,7 +33,7 @@
 // ARMV7_SOFTFLOAT: "-mfloat-abi" "soft"
 // ARMV7_SOFTFLOAT: "-x" "c"
 
-// RUN: clang -ccc-host-triple x86_64-apple-darwin10 -### -S %s 2> %t.log \
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### -S %s 2> %t.log \
 // RUN:   -arch armv7 -mhard-float
 // RUN: FileCheck -check-prefix=ARMV7_HARDFLOAT %s < %t.log
 // ARMV7_HARDFLOAT: clang

diff --git a/test/Driver/clang_cpp.c b/test/Driver/clang_cpp.c
index 8638465e3a2fbafa9bbe2b8a29a67c6e236046d9..79b2f5513156636779522e09d0d60b2d3618bdb3 100644 (file)
--- a/test/Driver/clang_cpp.c
+++ b/test/Driver/clang_cpp.c
@@ -1,4 +1,4 @@
 // Verify that -include isn't included twice with -save-temps.
-// RUN: clang -S -o - %s -include %t.h -save-temps -### 2> %t.log
+// RUN: %clang -S -o - %s -include %t.h -save-temps -### 2> %t.log
 // RUN: grep '"-include' %t.log | count 1
 

diff --git a/test/Driver/clang_f_opts.c b/test/Driver/clang_f_opts.c
index 66853422dd1d6cf0cb231c4223d8b2b1b7119ce5..c4ea430fdf31aa458f870d6523d9a34b243bfbf3 100644 (file)
--- a/test/Driver/clang_f_opts.c
+++ b/test/Driver/clang_f_opts.c
@@ -1,6 +1,6 @@
-// RUN: clang -### -S -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings -fno-blocks -fno-builtin -fno-math-errno -fno-common -fno-pascal-strings -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings %s 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS1 %s
-// RUN: clang -### -S -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings -fno-blocks -fno-builtin -fno-math-errno -fno-common -fno-pascal-strings -fno-show-source-location -fshort-wchar %s 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS2 %s
-// RUN: clang -### -fshort-enums %s 2>&1 | FileCheck -check-prefix=CHECK-SHORT-ENUMS %s
+// RUN: %clang -### -S -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings -fno-blocks -fno-builtin -fno-math-errno -fno-common -fno-pascal-strings -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings %s 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS1 %s
+// RUN: %clang -### -S -fblocks -fbuiltin -fmath-errno -fcommon -fpascal-strings -fno-blocks -fno-builtin -fno-math-errno -fno-common -fno-pascal-strings -fno-show-source-location -fshort-wchar %s 2>&1 | FileCheck -check-prefix=CHECK-OPTIONS2 %s
+// RUN: %clang -### -fshort-enums %s 2>&1 | FileCheck -check-prefix=CHECK-SHORT-ENUMS %s
 
 // CHECK-OPTIONS1: -fblocks
 // CHECK-OPTIONS1: -fpascal-strings

diff --git a/test/Driver/cxx-pth.cpp b/test/Driver/cxx-pth.cpp
index e5b69c118fb37395cd709c75cd783a5dbb799e6c..e349691d423b7c70372faac03e3b5985ad2e285b 100644 (file)
--- a/test/Driver/cxx-pth.cpp
+++ b/test/Driver/cxx-pth.cpp
@@ -1,12 +1,12 @@
 // Test forced PTH for CXX support.
 
-// RUN: clang -x c++-header %s -### 2> %t.log
+// RUN: %clang -x c++-header %s -### 2> %t.log
 // RUN: FileCheck -check-prefix EMIT -input-file %t.log %s
 
 // EMIT: "{{.*}}/clang{{.*}}" {{.*}} "-emit-pth" "{{.*}}.cpp.gch" "-x" "c++-header" "{{.*}}.cpp"
 
 // RUN: touch %t.h.gch
-// RUN: clang -E -include %t.h %s -### 2> %t.log
+// RUN: %clang -E -include %t.h %s -### 2> %t.log
 // RUN: FileCheck -check-prefix USE -input-file %t.log %s
 
 // USE: "{{.*}}/clang{{.*}}" {{.*}}"-include-pth" "{{.*}}.h.gch" {{.*}}"-x" "c++" "{{.*}}.cpp"

diff --git a/test/Driver/darwin-arm.c b/test/Driver/darwin-arm.c
index 8b4c23d55724de38eab8b88136daba172433650f..330918dd47d0258b61f7e238d7b6cd35668ae903 100644 (file)
--- a/test/Driver/darwin-arm.c
+++ b/test/Driver/darwin-arm.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -arch arm -print-search-dirs | FileCheck %s
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -arch arm -print-search-dirs | FileCheck %s
 
 // Check that we look in the relative libexec directory.
 // CHECK: {{programs: =.*/../libexec:}}

diff --git a/test/Driver/darwin-as.c b/test/Driver/darwin-as.c
index 26e59a5ef67013a58006afa7f0878c41688a99cf..6410df08563773a0a6a600310a06853a8ef2e87f 100644 (file)
--- a/test/Driver/darwin-as.c
+++ b/test/Driver/darwin-as.c
@@ -1,9 +1,9 @@
-// RUN: clang -ccc-host-triple i386-apple-darwin10 -### -x assembler -c %s -static -dynamic 2>%t
+// RUN: %clang -ccc-host-triple i386-apple-darwin10 -### -x assembler -c %s -static -dynamic 2>%t
 // RUN: FileCheck -check-prefix=STATIC_AND_DYNAMIC-32 --input-file %t %s
 
 // CHECK-STATIC_AND_DYNAMIC-32: as{{(.exe)?}}" "-arch" "i386" "-force_cpusubtype_ALL" "-static" "-o"
 
-// RUN: clang -ccc-host-triple x86_64-apple-darwin10 -### -x assembler -c %s -static 2>%t
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin10 -### -x assembler -c %s -static 2>%t
 // RUN: FileCheck -check-prefix=STATIC-64 --input-file %t %s
 
 // CHECK-STATIC-64: as{{(.exe)?}}" "-arch" "x86_64" "-force_cpusubtype_ALL" "-o"

diff --git a/test/Driver/darwin-cc.c b/test/Driver/darwin-cc.c
index 1f4335855b02d146cae93d4363a320e54bba7be2..7a3a378f89a03402e7bd51484a833137976cbdfc 100644 (file)
--- a/test/Driver/darwin-cc.c
+++ b/test/Driver/darwin-cc.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-no-clang -ccc-host-triple i386-apple-darwin10 -m32 -### -MD -g -fast -Q -dA -mkernel -ansi -aFOO -S -o /tmp/OUTPUTNAME -g0 -gfull -O2 -Werror -pedantic -Wmost -w -std=c99 -trigraphs -v -pg -fFOO -undef -Qn --param a=b -fmudflap -coverage -save-temps -nostdinc -I ARG0 -F ARG1 -I ARG2 -P -MF ARG3 -MG -MP -remap -g3 -H -D ARG4 -U ARG5 -A ARG6 -D ARG7 -U ARG8 -A ARG9 -include ARG10 -pthread %s 2> %t.log
+// RUN: %clang -ccc-no-clang -ccc-host-triple i386-apple-darwin10 -m32 -### -MD -g -fast -Q -dA -mkernel -ansi -aFOO -S -o /tmp/OUTPUTNAME -g0 -gfull -O2 -Werror -pedantic -Wmost -w -std=c99 -trigraphs -v -pg -fFOO -undef -Qn --param a=b -fmudflap -coverage -save-temps -nostdinc -I ARG0 -F ARG1 -I ARG2 -P -MF ARG3 -MG -MP -remap -g3 -H -D ARG4 -U ARG5 -A ARG6 -D ARG7 -U ARG8 -A ARG9 -include ARG10 -pthread %s 2> %t.log
 // RUN: grep ' ".*cc1" "-E" "-nostdinc" "-v" "-I" "ARG0" "-F" "ARG1" "-I" "ARG2" "-P" "-MD" "/tmp/OUTPUTNAME.d" "-MF" "ARG3" "-MG" "-MP" "-MQ" "/tmp/OUTPUTNAME" "-remap" "-dD" "-H" "-D__STATIC__" "-D_REENTRANT" "-D" "ARG4" "-U" "ARG5" "-A" "ARG6" "-D" "ARG7" "-U" "ARG8" "-A" "ARG9" "-include" "ARG10" ".*darwin-cc.c" "-D_MUDFLAP" "-include" "mf-runtime.h" "-mmacosx-version-min=10.6.0" "-m32" "-mkernel" "-mtune=core2" "-ansi" "-std=c99" "-trigraphs" "-Werror" "-pedantic" "-Wmost" "-w" "-fast" "-fno-eliminate-unused-debug-symbols" "-fFOO" "-fmudflap" "-O2" "-undef" "-fpch-preprocess" "-o" ".*darwin-cc.i"' %t.log
 // RUN: grep ' ".*cc1" "-fpreprocessed" ".*darwin-cc.i" "-O3" "-dumpbase" ".*darwin-cc.c" "-dA" "-mmacosx-version-min=10.6.0" "-m32" "-mkernel" "-mtune=core2" "-ansi" "-aFOO" "-auxbase-strip" "/tmp/OUTPUTNAME" "-g" "-g0" "-g" "-g3" "-O2" "-Werror" "-pedantic" "-Wmost" "-w" "-ansi" "-std=c99" "-trigraphs" "-version" "-p" "-fast" "-fno-eliminate-unused-debug-symbols" "-fFOO" "-fmudflap" "-undef" "-fno-ident" "-o" "/tmp/OUTPUTNAME" "--param" "a=b" "-fno-builtin" "-fno-merge-constants" "-fprofile-arcs" "-ftest-coverage"' %t.log
 

diff --git a/test/Driver/darwin-ld.c b/test/Driver/darwin-ld.c
index 04f35be09f1db9f6a0fa6bedbe0785e35e950123..de751a67d9655ed412478c5df1b44ac37c50be6d 100644 (file)
--- a/test/Driver/darwin-ld.c
+++ b/test/Driver/darwin-ld.c
@@ -1,26 +1,26 @@
 // Check that ld gets arch_multiple.
 
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -arch i386 -arch x86_64 %s -### -o foo 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -arch i386 -arch x86_64 %s -### -o foo 2> %t.log
 // RUN: grep '".*ld.*" .*"-arch_multiple" "-final_output" "foo"' %t.log
 
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -filelist FOO -static 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -filelist FOO -static 2> %t.log
 // RUN: grep '"-lcrt0.o" .*"-lgcc_static"' %t.log
 // RUN: grep '"-lgcc"' %t.log | count 0
-// RUN: clang -ccc-host-triple i386-apple-darwin7 -### -filelist FOO 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin7 -### -filelist FOO 2> %t.log
 // RUN: grep '"-lcrt1.o" .*"-lgcc" "-lSystem"' %t.log
 // RUN: grep '"-lgcc_s"' %t.log | count 0
-// RUN: clang -ccc-host-triple i386-apple-darwin8 -### -filelist FOO 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin8 -### -filelist FOO 2> %t.log
 // RUN: grep '"-lcrt1.o" .*"-lgcc_s.10.4" "-lgcc" "-lSystem"' %t.log
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -filelist FOO 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -filelist FOO 2> %t.log
 // RUN: grep '"-lcrt1.10.5.o" .*"-lgcc_s.10.5" "-lgcc" "-lSystem"' %t.log
-// RUN: clang -ccc-host-triple i386-apple-darwin10 -### -filelist FOO 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin10 -### -filelist FOO 2> %t.log
 // RUN: grep '"-lcrt1.10.6.o" .*"-lSystem" "-lgcc"' %t.log
 // RUN: grep '"-lgcc_s"' %t.log | count 0
 
 // Make sure we run dsymutil on source input files.
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -g %s -o BAR 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -g %s -o BAR 2> %t.log
 // RUN: grep '".*dsymutil" "BAR"' %t.log
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -g -filelist FOO %s -o BAR 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -g -filelist FOO %s -o BAR 2> %t.log
 // RUN: grep '".*dsymutil" "BAR"' %t.log
 
 // Splatter test case. This is gross, but it works for now. For the
@@ -32,11 +32,11 @@
 //
 // Note that at conception, this exactly matches gcc.
 
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -A ARG0 -F ARG1 -L ARG2 -Mach -T ARG4 -X -Z -all_load -allowable_client ARG8 -bind_at_load -compatibility_version ARG11 -current_version ARG12 -d -dead_strip -dylib_file ARG14 -dylinker -dylinker_install_name ARG16 -dynamic -dynamiclib -e ARG19 -exported_symbols_list ARG20 -fexceptions -flat_namespace -fnested-functions -fopenmp -force_cpusubtype_ALL -fpie -fprofile-arcs -headerpad_max_install_names -image_base ARG29 -init ARG30 -install_name ARG31 -m ARG33 -miphoneos-version-min=2.0 -mmacosx-version-min=10.3.2 -multi_module -multiply_defined ARG37 -multiply_defined_unused ARG38 -no_dead_strip_inits_and_terms -nodefaultlibs -nofixprebinding -nomultidefs -noprebind -noseglinkedit -nostartfiles -nostdlib -pagezero_size ARG54 -pg -prebind -prebind_all_twolevel_modules -preload -r -read_only_relocs ARG55 -s -sectalign ARG57_0 ARG57_1 ARG57_2 -sectcreate ARG58_0 ARG58_1 ARG58_2 -sectobjectsymbols ARG59_0 ARG59_1 -sectorder ARG60_0 ARG60_1 ARG60_2 -seg1addr ARG61 -seg_addr_table ARG62 -seg_addr_table_filename ARG63 -segaddr ARG64_0 ARG64_1 -segcreate ARG65_0 ARG65_1 ARG65_2 -seglinkedit -segprot ARG67_0 ARG67_1 ARG67_2 -segs_read_FOO -segs_read_only_addr ARG69 -segs_read_write_addr ARG70 -shared-libgcc -single_module -static -static-libgcc -sub_library ARG77 -sub_umbrella ARG78 -t -twolevel_namespace -twolevel_namespace_hints -u ARG82 -umbrella ARG83 -undefined ARG84 -unexported_symbols_list ARG85 -w -weak_reference_mismatches ARG87 -whatsloaded -whyload -y -filelist FOO 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -A ARG0 -F ARG1 -L ARG2 -Mach -T ARG4 -X -Z -all_load -allowable_client ARG8 -bind_at_load -compatibility_version ARG11 -current_version ARG12 -d -dead_strip -dylib_file ARG14 -dylinker -dylinker_install_name ARG16 -dynamic -dynamiclib -e ARG19 -exported_symbols_list ARG20 -fexceptions -flat_namespace -fnested-functions -fopenmp -force_cpusubtype_ALL -fpie -fprofile-arcs -headerpad_max_install_names -image_base ARG29 -init ARG30 -install_name ARG31 -m ARG33 -miphoneos-version-min=2.0 -mmacosx-version-min=10.3.2 -multi_module -multiply_defined ARG37 -multiply_defined_unused ARG38 -no_dead_strip_inits_and_terms -nodefaultlibs -nofixprebinding -nomultidefs -noprebind -noseglinkedit -nostartfiles -nostdlib -pagezero_size ARG54 -pg -prebind -prebind_all_twolevel_modules -preload -r -read_only_relocs ARG55 -s -sectalign ARG57_0 ARG57_1 ARG57_2 -sectcreate ARG58_0 ARG58_1 ARG58_2 -sectobjectsymbols ARG59_0 ARG59_1 -sectorder ARG60_0 ARG60_1 ARG60_2 -seg1addr ARG61 -seg_addr_table ARG62 -seg_addr_table_filename ARG63 -segaddr ARG64_0 ARG64_1 -segcreate ARG65_0 ARG65_1 ARG65_2 -seglinkedit -segprot ARG67_0 ARG67_1 ARG67_2 -segs_read_FOO -segs_read_only_addr ARG69 -segs_read_write_addr ARG70 -shared-libgcc -single_module -static -static-libgcc -sub_library ARG77 -sub_umbrella ARG78 -t -twolevel_namespace -twolevel_namespace_hints -u ARG82 -umbrella ARG83 -undefined ARG84 -unexported_symbols_list ARG85 -w -weak_reference_mismatches ARG87 -whatsloaded -whyload -y -filelist FOO 2> %t.log
 // RUN: grep '".*ld.*" "-static" "-dylib" "-dylib_compatibility_version" "ARG11" "-dylib_current_version" "ARG12" "-arch" "i386" "-dylib_install_name" "ARG31" "-all_load" "-allowable_client" "ARG8" "-bind_at_load" "-dead_strip" "-no_dead_strip_inits_and_terms" "-dylib_file" "ARG14" "-dynamic" "-exported_symbols_list" "ARG20" "-flat_namespace" "-headerpad_max_install_names" "-image_base" "ARG29" "-init" "ARG30" "-macosx_version_min" "10.3.2" "-iphoneos_version_min" "2.0" "-nomultidefs" "-multi_module" "-single_module" "-multiply_defined" "ARG37" "-multiply_defined_unused" "ARG38" "-pie" "-prebind" "-noprebind" "-nofixprebinding" "-prebind_all_twolevel_modules" "-read_only_relocs" "ARG55" "-sectcreate" "ARG58_0" "ARG58_1" "ARG58_2" "-sectorder" "ARG60_0" "ARG60_1" "ARG60_2" "-seg1addr" "ARG61" "-segprot" "ARG67_0" "ARG67_1" "ARG67_2" "-segaddr" "ARG64_0" "ARG64_1" "-segs_read_only_addr" "ARG69" "-segs_read_write_addr" "ARG70" "-seg_addr_table" "ARG62" "-seg_addr_table_filename" "ARG63" "-sub_library" "ARG77" "-sub_umbrella" "ARG78" "-twolevel_namespace" "-twolevel_namespace_hints" "-umbrella" "ARG83" "-undefined" "ARG84" "-unexported_symbols_list" "ARG85" "-weak_reference_mismatches" "ARG87" "-X" "-y" "-w" "-pagezero_size" "ARG54" "-segs_read_FOO" "-seglinkedit" "-noseglinkedit" "-sectalign" "ARG57_0" "ARG57_1" "ARG57_2" "-sectobjectsymbols" "ARG59_0" "ARG59_1" "-segcreate" "ARG65_0" "ARG65_1" "ARG65_2" "-whyload" "-whatsloaded" "-dylinker_install_name" "ARG16" "-dylinker" "-Mach" "-d" "-s" "-t" "-Z" "-u" "ARG82" "-undefined" "ARG84" "-A" "ARG0" "-e" "ARG19" "-m" "ARG33" "-r" "-o" "a.out" "-L" "ARG2" "-lgomp" "-L/usr/lib/i686-apple-darwin.*/4.2.1" "-L/usr/lib/gcc/i686-apple-darwin.*/4.2.1" "-L/usr/lib/gcc/i686-apple-darwin.*/4.2.1" "-L/usr/lib/gcc/i686-apple-darwin.*/4.2.1/../../../i686-apple-darwin.*/4.2.1" "-L/usr/lib/gcc/i686-apple-darwin.*/4.2.1/../../.." "-filelist" "FOO" "-lgcov" "-allow_stack_execute" "-T" "ARG4" "-F" "ARG1"' %t.log
 
 // Don't run dsymutil on a fat build of an executable.
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -arch i386 -arch x86_64 -g %s 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -arch i386 -arch x86_64 -g %s 2> %t.log
 // RUN: grep dsymutil %t.log | count 0
 
 

diff --git a/test/Driver/darwin-version.c b/test/Driver/darwin-version.c
index dd6905a5896164c7c4ea8ddb302665fd7bb25c2b..e69a8447c4a7c252e5df486479136e2405e7c75b 100644 (file)
--- a/test/Driver/darwin-version.c
+++ b/test/Driver/darwin-version.c
@@ -1,4 +1,4 @@
-// RUN: env MACOSX_DEPLOYMENT_TARGET=10.1 clang -ccc-host-triple i386-apple-darwin9 -E %s
+// RUN: env MACOSX_DEPLOYMENT_TARGET=10.1 %clang -ccc-host-triple i386-apple-darwin9 -E %s
 
 #if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1010
 #error Invalid version

diff --git a/test/Driver/default-toolchain.c b/test/Driver/default-toolchain.c
index 9cebdfe581fef2bd0fbc0ea8284b6c79ba9f6df6..eeff7637b20eb2373bd933078ab105643aa36899 100644 (file)
--- a/test/Driver/default-toolchain.c
+++ b/test/Driver/default-toolchain.c
@@ -1,8 +1,8 @@
-// RUN: clang -ccc-host-triple i386-unknown-unknown -m64 -v 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -m64 -v 2> %t
 // RUN: grep 'Target: x86_64-unknown-unknown' %t
 
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -arch ppc -m64 -v 2> %t
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -arch ppc -m64 -v 2> %t
 // RUN: grep 'Target: powerpc64-apple-darwin9' %t
 
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -arch ppc64 -m32 -v 2> %t
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -arch ppc64 -m32 -v 2> %t
 // RUN: grep 'Target: powerpc-apple-darwin9' %t

diff --git a/test/Driver/dragonfly.c b/test/Driver/dragonfly.c
index 2eb3b1808ee8daf5d0497f9717d21fa01bdbec1a..d7b954d586d7e603d501119a02573737850e8818 100644 (file)
--- a/test/Driver/dragonfly.c
+++ b/test/Driver/dragonfly.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-host-triple amd64-pc-dragonfly %s -### 2> %t.log
+// RUN: %clang -ccc-host-triple 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/emit-llvm.c b/test/Driver/emit-llvm.c
index 27007c68c2fe40e59a625ea0ede7b071d2472d77..e0cc0b5dc2194379c0c436f9f9bc588083e85503 100644 (file)
--- a/test/Driver/emit-llvm.c
+++ b/test/Driver/emit-llvm.c
@@ -1,3 +1,3 @@
-// RUN: not clang -ccc-host-triple i386-pc-linux-gnu -emit-llvm -o %t %s 2> %t.log
+// RUN: not %clang -ccc-host-triple i386-pc-linux-gnu -emit-llvm -o %t %s 2> %t.log
 // RUN: grep 'unable to pass LLVM bit-code files to linker' %t.log
 

diff --git a/test/Driver/flags.c b/test/Driver/flags.c
index bc50aae33870025cee4db223c092c902e6badc2f..6d80892da65a07744130e5cb79043bd53d0f51d0 100644 (file)
--- a/test/Driver/flags.c
+++ b/test/Driver/flags.c
@@ -1,9 +1,9 @@
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -S -msoft-float %s 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -S -msoft-float %s 2> %t.log
 // RUN: grep '"-no-implicit-float"' %t.log
 
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -S -msoft-float -mno-soft-float %s 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -S -msoft-float -mno-soft-float %s 2> %t.log
 // RUN: grep '"-no-implicit-float"' %t.log | count 0
 
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -### -S -mno-soft-float %s -msoft-float 2> %t.log
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -### -S -mno-soft-float %s -msoft-float 2> %t.log
 // RUN: grep '"-no-implicit-float"' %t.log
 

diff --git a/test/Driver/freebsd.c b/test/Driver/freebsd.c
index 9700540f46bb48b33e5211835743f9f00aa955a0..3deee46f9a010a7e51eca488f4a196ca96924375 100644 (file)
--- a/test/Driver/freebsd.c
+++ b/test/Driver/freebsd.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-clang-archs "" -ccc-host-triple powerpc64-pc-freebsd8 %s -### 2> %t.log
+// RUN: %clang -ccc-clang-archs "" -ccc-host-triple powerpc64-pc-freebsd8 %s -### 2> %t.log
 // RUN: cat %t.log
 // RUN: FileCheck -input-file %t.log %s
 

diff --git a/test/Driver/hello.c b/test/Driver/hello.c
index e1b6f1a0fd7a52c8b1ec02e3b4df6032d0db562a..da628724d6d947bb6abe9e574050db0f0fed362e 100644 (file)
--- a/test/Driver/hello.c
+++ b/test/Driver/hello.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-echo -o %t %s 2> %t.log
+// RUN: %clang -ccc-echo -o %t %s 2> %t.log
 
 // Make sure we used clang.
 // RUN: grep 'clang" -cc1 .*hello.c' %t.log

diff --git a/test/Driver/immediate-options.c b/test/Driver/immediate-options.c
index 923c30ea95cea19201b55abcf479beaeffe87e76..5a3ec872b4fe33ecd9fd20dc0237af8ff5231013 100644 (file)
--- a/test/Driver/immediate-options.c
+++ b/test/Driver/immediate-options.c
@@ -1,4 +1,4 @@
-// RUN: clang --help
-// RUN: clang --help-hidden
-// RUN: clang -dumpversion
-// RUN: clang -print-search-dirs
+// RUN: %clang --help
+// RUN: %clang --help-hidden
+// RUN: %clang -dumpversion
+// RUN: %clang -print-search-dirs

diff --git a/test/Driver/lto.c b/test/Driver/lto.c
index 041b4246180878083cddfaeff29d8d53cb41ec6b..4543ffcd023e664cd88db762c1c059525336ef80 100644 (file)
--- a/test/Driver/lto.c
+++ b/test/Driver/lto.c
@@ -1,12 +1,12 @@
 // -emit-llvm, -flto, and -O4 all cause a switch to llvm-bc object
 // files.
-// RUN: clang -ccc-print-phases -c %s -flto 2> %t.log
+// RUN: %clang -ccc-print-phases -c %s -flto 2> %t.log
 // RUN: grep '2: compiler, {1}, llvm-bc' %t.log
-// RUN: clang -ccc-print-phases -c %s -O4 2> %t.log
+// RUN: %clang -ccc-print-phases -c %s -O4 2> %t.log
 // RUN: grep '2: compiler, {1}, llvm-bc' %t.log
 
 // and -emit-llvm doesn't alter pipeline (unfortunately?).
-// RUN: clang -ccc-print-phases %s -emit-llvm 2> %t.log
+// RUN: %clang -ccc-print-phases %s -emit-llvm 2> %t.log
 // RUN: grep '0: input, ".*lto.c", c' %t.log
 // RUN: grep '1: preprocessor, {0}, cpp-output' %t.log
 // RUN: grep '2: compiler, {1}, llvm-bc' %t.log
@@ -14,11 +14,11 @@
 
 // llvm-bc and llvm-ll outputs need to match regular suffixes
 // (unfortunately).
-// RUN: clang %s -emit-llvm -save-temps -### 2> %t.log
+// RUN: %clang %s -emit-llvm -save-temps -### 2> %t.log
 // RUN: grep '"-o" ".*lto\.i" "-x" "c" ".*lto\.c"' %t.log
 // RUN: grep '"-o" ".*lto\.o" .*".*lto\.i"' %t.log
 // RUN: grep '".*a.out" .*".*lto\.o"' %t.log
 
-// RUN: clang %s -emit-llvm -S -### 2> %t.log
+// RUN: %clang %s -emit-llvm -S -### 2> %t.log
 // RUN: grep '"-o" ".*lto\.s" "-x" "c" ".*lto\.c"' %t.log
 

diff --git a/test/Driver/openbsd.c b/test/Driver/openbsd.c
index 97ba30bb69c23ebf7174567b44cc359e02edfb70..6024461069a19ad76cfd3627db9c84a328e19017 100644 (file)
--- a/test/Driver/openbsd.c
+++ b/test/Driver/openbsd.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-clang-archs "" -ccc-host-triple i686-pc-openbsd %s -### 2> %t.log
+// RUN: %clang -ccc-clang-archs "" -ccc-host-triple 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/parsing.c b/test/Driver/parsing.c
index 48b9d6a23f1fd7e7b758132ed66e662fb556fb39..ca3a7f44fd8eaa29f8da25cadb31b589c1d5e0b8 100644 (file)
--- a/test/Driver/parsing.c
+++ b/test/Driver/parsing.c
@@ -1,4 +1,4 @@
-// RUN: clang -ccc-print-options input -Yunknown -m32 -arch ppc -djoined -A separate -Ajoined -Wp,one,two -Xarch_joined AndSeparate -sectalign 1 2 3 2> %t
+// RUN: %clang -ccc-print-options input -Yunknown -m32 -arch ppc -djoined -A separate -Ajoined -Wp,one,two -Xarch_joined AndSeparate -sectalign 1 2 3 2> %t
 // RUN: grep 'Option 0 - Name: "-ccc-print-options", Values: {}' %t
 // RUN: grep 'Option 1 - Name: "<input>", Values: {"input"}' %t
 // RUN: grep 'Option 2 - Name: "<unknown>", Values: {"-Yunknown"}' %t
@@ -11,13 +11,13 @@
 // RUN: grep 'Option 9 - Name: "-Xarch_", Values: {"joined", "AndSeparate"}' %t
 // RUN: grep 'Option 10 - Name: "-sectalign", Values: {"1", "2", "3"}' %t
 
-// RUN: not clang -V 2> %t
+// RUN: not %clang -V 2> %t
 // RUN: grep "error: argument to '-V' is missing (expected 1 value)" %t
-// RUN: not clang -sectalign 1 2 2> %t
+// RUN: not %clang -sectalign 1 2 2> %t
 // RUN: grep "error: argument to '-sectalign' is missing (expected 3 values)" %t
 
 // Verify that search continues after find the first option.
-// RUN: clang -ccc-print-options -Wally 2> %t
+// RUN: %clang -ccc-print-options -Wally 2> %t
 // RUN: grep 'Option 0 - Name: "-ccc-print-options", Values: {}' %t
 // RUN: grep 'Option 1 - Name: "-W", Values: {"ally"}' %t
 

diff --git a/test/Driver/phases.c b/test/Driver/phases.c
index d03bff9a77b1c941aa5e40c3b8c5bbabac21f6cc..7fe529c51a9307b37747991fe9be4606da43a5a7 100644 (file)
--- a/test/Driver/phases.c
+++ b/test/Driver/phases.c
@@ -1,5 +1,5 @@
 // Basic compilation for various types of files.
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c %s -x objective-c %s -x c++ %s -x objective-c++ -x assembler %s -x assembler-with-cpp %s -x none %s 2>&1 | FileCheck -check-prefix=BASIC %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c %s -x objective-c %s -x c++ %s -x objective-c++ -x assembler %s -x assembler-with-cpp %s -x none %s 2>&1 | FileCheck -check-prefix=BASIC %s
 // BASIC: 0: input, "{{.*}}phases.c", c
 // BASIC: 1: preprocessor, {0}, cpp-output
 // BASIC: 2: compiler, {1}, assembler
@@ -24,7 +24,7 @@
 // BASIC: 21: linker, {3, 7, 11, 13, 16, 20}, image
 
 // Universal linked image.
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -x c %s -arch ppc -arch i386 2>&1 | FileCheck -check-prefix=ULI %s
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -x c %s -arch ppc -arch i386 2>&1 | FileCheck -check-prefix=ULI %s
 // ULI: 0: input, "{{.*}}phases.c", c
 // ULI: 1: preprocessor, {0}, cpp-output
 // ULI: 2: compiler, {1}, assembler
@@ -35,7 +35,7 @@
 // ULI: 7: lipo, {5, 6}, image
 
 // Universal object file.
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x c %s -arch ppc -arch i386 2>&1 | FileCheck -check-prefix=UOF %s
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x c %s -arch ppc -arch i386 2>&1 | FileCheck -check-prefix=UOF %s
 // UOF: 0: input, "{{.*}}phases.c", c
 // UOF: 1: preprocessor, {0}, cpp-output
 // UOF: 2: compiler, {1}, assembler
@@ -45,33 +45,33 @@
 // UOF: 6: lipo, {4, 5}, object
 
 // Arch defaulting
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s 2>&1 | FileCheck -check-prefix=ARCH1 %s
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s 2>&1 | FileCheck -check-prefix=ARCH1 %s
 // ARCH1: 2: bind-arch, "i386", {1}, object
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s -m32 -m64 2>&1 | FileCheck -check-prefix=ARCH2 %s
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c -x assembler %s -m32 -m64 2>&1 | FileCheck -check-prefix=ARCH2 %s
 // ARCH2: 2: bind-arch, "x86_64", {1}, object
-// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s 2>&1 | FileCheck -check-prefix=ARCH3 %s
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s 2>&1 | FileCheck -check-prefix=ARCH3 %s
 // ARCH3: 2: bind-arch, "x86_64", {1}, object
-// RUN: clang -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s -m64 -m32 2>&1 | FileCheck -check-prefix=ARCH4 %s
+// RUN: %clang -ccc-host-triple x86_64-apple-darwin9 -ccc-print-phases -c -x assembler %s -m64 -m32 2>&1 | FileCheck -check-prefix=ARCH4 %s
 // ARCH4: 2: bind-arch, "i386", {1}, object
 
 // Analyzer
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases --analyze %s 2>&1 | FileCheck -check-prefix=ANALYZE %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases --analyze %s 2>&1 | FileCheck -check-prefix=ANALYZE %s
 // ANALYZE: 0: input, "{{.*}}phases.c", c
 // ANALYZE: 1: preprocessor, {0}, cpp-output
 // ANALYZE: 2: analyzer, {1}, plist
 
 // Precompiler
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c-header %s 2>&1 | FileCheck -check-prefix=PCH %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -x c-header %s 2>&1 | FileCheck -check-prefix=PCH %s
 // PCH: 0: input, "{{.*}}phases.c", c-header
 // PCH: 1: preprocessor, {0}, c-header-cpp-output
 // PCH: 2: precompiler, {1}, precompiled-header
 
 // Darwin overrides the handling for .s
 // RUN: touch %t.s
-// RUN: clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -c %t.s 2>&1 | FileCheck -check-prefix=DARWIN1 %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -ccc-print-phases -c %t.s 2>&1 | FileCheck -check-prefix=DARWIN1 %s
 // DARWIN1: 0: input, "{{.*}}.s", assembler
 // DARWIN1: 1: assembler, {0}, object
-// RUN: clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c %t.s 2>&1 | FileCheck -check-prefix=DARWIN2 %s
+// RUN: %clang -ccc-host-triple i386-apple-darwin9 -ccc-print-phases -c %t.s 2>&1 | FileCheck -check-prefix=DARWIN2 %s
 // DARWIN2: 0: input, "{{.*}}.s", assembler-with-cpp
 // DARWIN2: 1: preprocessor, {0}, assembler
 // DARWIN2: 2: assembler, {1}, object

diff --git a/test/Driver/preprocessor.c b/test/Driver/preprocessor.c
index 51b6fc57867eb87dc4057d1e474fcf682db4f0f1..09c1f6c29cc65360efd4a684e8370f3c455cdb1e 100644 (file)
--- a/test/Driver/preprocessor.c
+++ b/test/Driver/preprocessor.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -x c-header %s > %t
+// RUN: %clang -E -x c-header %s > %t
 // RUN: grep 'B B' %t
 
 #define A B

diff --git a/test/Driver/pth.c b/test/Driver/pth.c
index 938675a900d84995d13b99f39b3ef0171c131486..9c47c5599376a2fef41f95fcaebb7abbd5948e9a 100644 (file)
--- 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 -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 -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/qa_override.c b/test/Driver/qa_override.c
index 822410659ead7340ae8289bc70ce447cc6902528..5f96976ee98e192c47e076dcb03e6f61074cade8 100644 (file)
--- a/test/Driver/qa_override.c
+++ b/test/Driver/qa_override.c
@@ -1,4 +1,4 @@
-// RUN: env QA_OVERRIDE_GCC3_OPTIONS="#+-Os +-Oz +-O +-O3 +-Oignore +a +b +c xb Xa Omagic ^-ccc-print-options  " clang x -O2 b -O3 2>&1 | FileCheck %s
+// RUN: env QA_OVERRIDE_GCC3_OPTIONS="#+-Os +-Oz +-O +-O3 +-Oignore +a +b +c xb Xa Omagic ^-ccc-print-options  " %clang x -O2 b -O3 2>&1 | FileCheck %s
 // CHECK-NOT: ###
 // CHECK: Option 0 - Name: "-ccc-print-options", Values: {}
 // CHECK-NEXT: Option 1 - Name: "<input>", Values: {"x"}

diff --git a/test/Driver/redzone.c b/test/Driver/redzone.c
index 86f412fb46900f0f0c73fda4209d316c210bbd2e..9f117d0489bd86c0564d14c63dc45f2a3c514f84 100644 (file)
--- a/test/Driver/redzone.c
+++ b/test/Driver/redzone.c
@@ -1,6 +1,6 @@
-// RUN: clang -ccc-host-triple i386-unknown-unknown -mno-red-zone %s -S -emit-llvm -o %t.log
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -mno-red-zone %s -S -emit-llvm -o %t.log
 // RUN: grep 'noredzone' %t.log
-// RUN: clang -ccc-host-triple i386-unknown-unknown -mred-zone %s -S -emit-llvm -o %t.log
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -mred-zone %s -S -emit-llvm -o %t.log
 // RUN: grep -v 'noredzone' %t.log 
 
 int foo() { return 42; }

diff --git a/test/Driver/std.c b/test/Driver/std.c
index 01a5f7ccec255a93534efcd3339ff31e8a6b6e35..c82e9f15c7daeb1c1fc31a8c8254b3041e434c10 100644 (file)
--- a/test/Driver/std.c
+++ b/test/Driver/std.c
@@ -1,8 +1,8 @@
-// RUN: clang -std=c99 -trigraphs -std=gnu99 %s -E -o - | FileCheck -check-prefix=OVERRIDE %s
+// RUN: %clang -std=c99 -trigraphs -std=gnu99 %s -E -o - | FileCheck -check-prefix=OVERRIDE %s
 // OVERRIDE: ??(??)
-// RUN: clang -ansi %s -E -o - | FileCheck -check-prefix=ANSI %s
+// RUN: %clang -ansi %s -E -o - | FileCheck -check-prefix=ANSI %s
 // ANSI: []
-// RUN: clang -std=gnu99 -trigraphs %s -E -o - | FileCheck -check-prefix=EXPLICIT %s
+// RUN: %clang -std=gnu99 -trigraphs %s -E -o - | FileCheck -check-prefix=EXPLICIT %s
 // EXPLICIT: []
 
 ??(??)

diff --git a/test/Driver/unknown-gcc-arch.c b/test/Driver/unknown-gcc-arch.c
index e8b653fbceab0fe2a7e4cb1170b2130daf7c7c10..7018bf839d023fdb54e75a57a61c37c6b48a9811 100644 (file)
--- a/test/Driver/unknown-gcc-arch.c
+++ b/test/Driver/unknown-gcc-arch.c
@@ -1,8 +1,8 @@
-// RUN: clang -ccc-host-triple x86_64-unknown-unknown -c -x assembler %s -### 2> %t.log
+// RUN: %clang -ccc-host-triple x86_64-unknown-unknown -c -x assembler %s -### 2> %t.log
 // RUN: grep '.*gcc.*"-m64"' %t.log
-// RUN: clang -ccc-host-triple x86_64-unknown-unknown -c -x assembler %s -### -m32 2> %t.log
+// RUN: %clang -ccc-host-triple x86_64-unknown-unknown -c -x assembler %s -### -m32 2> %t.log
 // RUN: grep '.*gcc.*"-m32"' %t.log
-// RUN: clang -ccc-host-triple i386-unknown-unknown -c -x assembler %s -### 2> %t.log
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -c -x assembler %s -### 2> %t.log
 // RUN: grep '.*gcc.*"-m32"' %t.log
-// RUN: clang -ccc-host-triple i386-unknown-unknown -c -x assembler %s -### -m64 2> %t.log
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -c -x assembler %s -### -m64 2> %t.log
 // RUN: grep '.*gcc.*"-m64"' %t.log

diff --git a/test/Driver/x86_features.c b/test/Driver/x86_features.c
index d0473b38bb1e0534f5a37a7f1968d9c7a4d3b4be..9dbdd0ae90b4b390260fc8f311687b061f6a25d7 100644 (file)
--- a/test/Driver/x86_features.c
+++ b/test/Driver/x86_features.c
@@ -1,3 +1,3 @@
-// RUN: clang -ccc-host-triple i386-unknown-unknown -### -S %s -msse -msse4 -mno-sse -mno-mmx -msse 2> %t
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -### -S %s -msse -msse4 -mno-sse -mno-mmx -msse 2> %t
 // RUN: grep '"-target-feature" "+sse" "-target-feature" "+sse4" "-target-feature" "-sse" "-target-feature" "-mmx" "-target-feature" "+sse"' %t
 

diff --git a/test/Frontend/ast-codegen.c b/test/Frontend/ast-codegen.c
index bd8a20adb69b3539989a666b94391b5a267737e8..b5b2157e21aea20014ca85ed52f242fdecc3e431 100644 (file)
--- a/test/Frontend/ast-codegen.c
+++ b/test/Frontend/ast-codegen.c
@@ -1,5 +1,5 @@
-// RUN: clang -emit-ast -o %t.ast %s
-// RUN: clang -emit-llvm -S -o - %t.ast | FileCheck %s
+// RUN: %clang -emit-ast -o %t.ast %s
+// RUN: %clang -emit-llvm -S -o - %t.ast | FileCheck %s
 
 // CHECK: module asm "foo"
 __asm__("foo");

diff --git a/test/Frontend/ast-main.c b/test/Frontend/ast-main.c
index ef072b92f9c18cb0a57586a9f902543afe250a66..43237a12ef597243a52d2176015e161470c32035 100644 (file)
--- a/test/Frontend/ast-main.c
+++ b/test/Frontend/ast-main.c
@@ -1,6 +1,6 @@
-// RUN: clang -emit-llvm -S -o %t1.ll -x c - < %s
-// RUN: clang -emit-ast -o %t.ast %s
-// RUN: clang -emit-llvm -S -o %t2.ll -x ast - < %t.ast
+// RUN: %clang -emit-llvm -S -o %t1.ll -x c - < %s
+// RUN: %clang -emit-ast -o %t.ast %s
+// RUN: %clang -emit-llvm -S -o %t2.ll -x ast - < %t.ast
 // RUN: diff %t1.ll %t2.ll
 
 int main() {

diff --git a/test/Frontend/cpp-output.c b/test/Frontend/cpp-output.c
index 9a6fc9b214255691b3ae3ab94446f880d45a51b7..e44095b5990245f6c7483669416de6668ea8fdcf 100644 (file)
--- a/test/Frontend/cpp-output.c
+++ b/test/Frontend/cpp-output.c
@@ -1,7 +1,7 @@
-// RUN: clang -E -o %t -C %s
+// RUN: %clang -E -o %t -C %s
 // RUN: grep '^int x; // comment' %t
 // RUN: grep '^x x' %t
-// RUN: clang -E -o %t -CC %s
+// RUN: %clang -E -o %t -CC %s
 // RUN: grep '^int x; // comment' %t
 // RUN: grep '^x /\* comment \*/ x /\* comment \*/' %t
 

diff --git a/test/Frontend/darwin-version.c b/test/Frontend/darwin-version.c
index 4896aecdfae5b4c7216d2c05ba0d8c3d64392dd2..1c866ee096010234c1e6fd9f0e35993474047434 100644 (file)
--- a/test/Frontend/darwin-version.c
+++ b/test/Frontend/darwin-version.c
@@ -1,22 +1,22 @@
-// RUN: clang -ccc-host-triple armv6-apple-darwin9 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple armv6-apple-darwin9 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__' %t | grep '30000' | count 1
 // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | count 0
-// RUN: clang -ccc-host-triple armv6-apple-darwin9 -miphoneos-version-min=2.0 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple armv6-apple-darwin9 -miphoneos-version-min=2.0 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__' %t | grep '20000' | count 1
 // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | count 0
-// RUN: clang -ccc-host-triple armv6-apple-darwin9 -miphoneos-version-min=2.2 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple armv6-apple-darwin9 -miphoneos-version-min=2.2 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__' %t | grep '20200' | count 1
-// RUN: clang -ccc-host-triple i686-apple-darwin8 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i686-apple-darwin8 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__' %t | count 0
 // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '1040' | count 1
-// RUN: clang -ccc-host-triple i686-apple-darwin9 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i686-apple-darwin9 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '1050' | count 1
-// RUN: clang -ccc-host-triple i686-apple-darwin10 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i686-apple-darwin10 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '1060' | count 1
-// RUN: clang -ccc-host-triple i686-apple-darwin9 -mmacosx-version-min=10.4 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i686-apple-darwin9 -mmacosx-version-min=10.4 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_IPHONE_OS_VERSION_MIN_REQUIRED__' %t | count 0
 // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '1040' | count 1
-// RUN: clang -ccc-host-triple i686-apple-darwin9 -mmacosx-version-min=10.5 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i686-apple-darwin9 -mmacosx-version-min=10.5 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '1050' | count 1
-// RUN: clang -ccc-host-triple i686-apple-darwin9 -mmacosx-version-min=10.6 -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i686-apple-darwin9 -mmacosx-version-min=10.6 -dM -E -o %t %s
 // RUN: grep '__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__' %t | grep '1060' | count 1

diff --git a/test/Frontend/dependency-gen.c b/test/Frontend/dependency-gen.c
index 9185921407da1c8e055f9dc723c7ee26524c1882..c85d60be73f8e0585c0cbcf67b88b5443256f513 100644 (file)
--- a/test/Frontend/dependency-gen.c
+++ b/test/Frontend/dependency-gen.c
@@ -1,8 +1,8 @@
 // rdar://6533411
-// RUN: clang -MD -MF %t.d -S -x c -o %t.o %s
+// RUN: %clang -MD -MF %t.d -S -x c -o %t.o %s
 // RUN: grep '.*dependency-gen.*:' %t.d
 // RUN: grep 'dependency-gen.c' %t.d
 
-// RUN: clang -S -M -x c %s -o %t.d
+// RUN: %clang -S -M -x c %s -o %t.d
 // RUN: grep '.*dependency-gen.*:' %t.d
 // RUN: grep 'dependency-gen.c' %t.d

diff --git a/test/Index/cindex-from-source.m b/test/Index/cindex-from-source.m
index 8d6a1de4bbdc4777b2caca364e5327aed80db9e2..e775bb71e11ec80cbf8f3b2a39be6df541cadbcd 100644 (file)
--- a/test/Index/cindex-from-source.m
+++ b/test/Index/cindex-from-source.m
@@ -1,5 +1,5 @@
 // RUN: echo 'typedef int t0;' > %t.pfx.h
-// RUN: clang -x objective-c-header %t.pfx.h -o %t.pfx.h.gch
+// RUN: %clang -x objective-c-header %t.pfx.h -o %t.pfx.h.gch
 // RUN: c-index-test -test-load-source local %s -include %t.pfx.h > %t
 // RUN: FileCheck %s < %t
 // CHECK: cindex-from-source.m:{{.*}}:{{.*}}: StructDecl=s0:{{.*}}:{{.*}} [Context=cindex-from-source.m]

diff --git a/test/Lexer/comment-escape.c b/test/Lexer/comment-escape.c
index c46145715843ce7317743d14031896d19bb8921e..191e65441dd4799b38e0f2e601ee0cb82d7a6e58 100644 (file)
--- a/test/Lexer/comment-escape.c
+++ b/test/Lexer/comment-escape.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only %s 
+// RUN: %clang -fsyntax-only %s 
 // rdar://6757323
 // foo \
 

diff --git a/test/Lexer/counter.c b/test/Lexer/counter.c
index 044570f88869bb56356ce5e365f0618b5f4f5fd4..21737300228df0d8b02f00a764d47a43d7c34ed0 100644 (file)
--- a/test/Lexer/counter.c
+++ b/test/Lexer/counter.c
@@ -1,5 +1,5 @@
 // __COUNTER__ support: rdar://4329310
-// RUN: clang -E %s > %t
+// RUN: %clang -E %s > %t
 
 #define PASTE2(x,y) x##y
 #define PASTE1(x,y) PASTE2(x,y)

diff --git a/test/Lexer/has_feature_exceptions.cpp b/test/Lexer/has_feature_exceptions.cpp
index 231a6c56a45b6d9d726859f5f216390aeb76a536..cfd1efbf84645a2b97bf12887d95b5b51ea3c997 100644 (file)
--- a/test/Lexer/has_feature_exceptions.cpp
+++ b/test/Lexer/has_feature_exceptions.cpp
@@ -1,5 +1,5 @@
-// RUN: clang -E -fexceptions %s -o - | FileCheck --check-prefix=CHECK-EXCEPTIONS %s
-// RUN: clang -E -fno-exceptions %s -o - | FileCheck --check-prefix=CHECK-NO-EXCEPTIONS %s
+// RUN: %clang -E -fexceptions %s -o - | FileCheck --check-prefix=CHECK-EXCEPTIONS %s
+// RUN: %clang -E -fno-exceptions %s -o - | FileCheck --check-prefix=CHECK-NO-EXCEPTIONS %s
 
 #if __has_feature(cxx_exceptions)
 int foo();

diff --git a/test/Lexer/has_feature_rtti.cpp b/test/Lexer/has_feature_rtti.cpp
index cc01f61cba67b4d2ded9ed87b146a772641006bf..690906c292f236b978269c79ff00b1581af8a8d1 100644 (file)
--- a/test/Lexer/has_feature_rtti.cpp
+++ b/test/Lexer/has_feature_rtti.cpp
@@ -1,5 +1,5 @@
-// RUN: clang -E -frtti %s -o - | FileCheck --check-prefix=CHECK-RTTI %s
-// RUN: clang -E -fno-rtti %s -o - | FileCheck --check-prefix=CHECK-NO-RTTI %s
+// RUN: %clang -E -frtti %s -o - | FileCheck --check-prefix=CHECK-RTTI %s
+// RUN: %clang -E -fno-rtti %s -o - | FileCheck --check-prefix=CHECK-NO-RTTI %s
 
 #if __has_feature(cxx_rtti)
 int foo();

diff --git a/test/PCH/pr4489.c b/test/PCH/pr4489.c
index aaf5aac749e54dcc0e93ba211893117ce84710e5..1d8be2d76cc565731f98b10995299b9e0179b647 100644 (file)
--- a/test/PCH/pr4489.c
+++ b/test/PCH/pr4489.c
@@ -1,6 +1,6 @@
-// RUN: clang -x c-header -o %t.pch %s
+// RUN: %clang -x c-header -o %t.pch %s
 // RUN: echo > %t.empty.c
-// RUN: clang -include %t -x c %t.empty.c -emit-llvm -S -o -
+// RUN: %clang -include %t -x c %t.empty.c -emit-llvm -S -o -
 // PR 4489: Crash with PCH
 // PR 4492: Crash with PCH (round two)
 // PR 4509: Crash with PCH (round three)

diff --git a/test/Preprocessor/dependencies-and-pp.c b/test/Preprocessor/dependencies-and-pp.c
index 5359d0af4d7a5ca9d8cac78417d547d3593c983b..d7bf4df51c81fce664f3b78586361b8dfcd0d08c 100644 (file)
--- a/test/Preprocessor/dependencies-and-pp.c
+++ b/test/Preprocessor/dependencies-and-pp.c
@@ -1,5 +1,5 @@
-// RUN: clang -E -o %t.1 %s
-// RUN: clang -E -MD -MF %t.d -MT foo -o %t.2 %s
+// RUN: %clang -E -o %t.1 %s
+// RUN: %clang -E -MD -MF %t.d -MT foo -o %t.2 %s
 // RUN: diff %t.1 %t.2
 // RUN: grep "foo:" %t.d
 // RUN: grep "dependencies-and-pp.c" %t.d

diff --git a/test/Preprocessor/dump-options.c b/test/Preprocessor/dump-options.c
index 8302f1a32615eb2cf2603427ac424a6c386e3886..a329bd46ac1d97af755e1135fa253d94fe8fea98 100644 (file)
--- a/test/Preprocessor/dump-options.c
+++ b/test/Preprocessor/dump-options.c
@@ -1,3 +1,3 @@
-// RUN: clang %s -E -dD | grep __INTMAX_MAX__
-// RUN: clang %s -E -dM | grep __INTMAX_MAX__
+// RUN: %clang %s -E -dD | grep __INTMAX_MAX__
+// RUN: %clang %s -E -dM | grep __INTMAX_MAX__
 

diff --git a/test/Preprocessor/header_lookup1.c b/test/Preprocessor/header_lookup1.c
index 961e55161418d0190debfc5262b29585bc07fb49..f93d0afe331ea8ee53533aa2065c48b2105cf59a 100644 (file)
--- a/test/Preprocessor/header_lookup1.c
+++ b/test/Preprocessor/header_lookup1.c
@@ -1,2 +1,2 @@
-// RUN: clang -fno-ms-extensions -I /usr/include %s -E | grep 'stdio.h.*3.*4'
+// RUN: %clang -fno-ms-extensions -I /usr/include %s -E | grep 'stdio.h.*3.*4'
 #include <stdio.h>

diff --git a/test/Preprocessor/macro-multiline.c b/test/Preprocessor/macro-multiline.c
index 9f24ae8e5563a1b7e5a921ea7414a03d33b6c3ee..df7c40a954d69de63db5cb93c14db5123656a9fd 100644 (file)
--- a/test/Preprocessor/macro-multiline.c
+++ b/test/Preprocessor/macro-multiline.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s "-DX=A
+// RUN: %clang -E %s "-DX=A
 // RUN: THIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT" > %t
 // RUN: grep "GOOD: A" %t
 // RUN: not grep THIS_SHOULD_NOT_EXIST_IN_THE_OUTPUT %t

diff --git a/test/Preprocessor/pic.c b/test/Preprocessor/pic.c
index b8068faac8c090754039630907319fd6582947bf..886beb7159539e953f960eabf1bea0eaed251e92 100644 (file)
--- a/test/Preprocessor/pic.c
+++ b/test/Preprocessor/pic.c
@@ -1,9 +1,9 @@
-// RUN: clang -ccc-host-triple i386-unknown-unknown -static -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -static -dM -E -o %t %s
 // RUN: grep '#define __PIC__' %t | count 0
 // RUN: grep '#define __pic__' %t | count 0
-// RUN: clang -ccc-host-triple i386-unknown-unknown -fpic -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -fpic -dM -E -o %t %s
 // RUN: grep '#define __PIC__ 1' %t | count 1
 // RUN: grep '#define __pic__ 1' %t | count 1
-// RUN: clang -ccc-host-triple i386-unknown-unknown -fPIC -dM -E -o %t %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -fPIC -dM -E -o %t %s
 // RUN: grep '#define __PIC__ 2' %t | count 1
 // RUN: grep '#define __pic__ 2' %t | count 1

diff --git a/test/Preprocessor/pragma_sysheader.c b/test/Preprocessor/pragma_sysheader.c
index 49082b8c09d1684cb097af53b4c12dd13bd67665..cf2843bffdea7316693ce6f46c91d71a66c2acce 100644 (file)
--- a/test/Preprocessor/pragma_sysheader.c
+++ b/test/Preprocessor/pragma_sysheader.c
@@ -1,3 +1,3 @@
-// RUN: clang -verify -pedantic %s -fsyntax-only
+// RUN: %clang -verify -pedantic %s -fsyntax-only
 // rdar://6899937
 #include "pragma_sysheader.h"

diff --git a/test/Preprocessor/print_line_count.c b/test/Preprocessor/print_line_count.c
index 2eb62df486880c5e2da8dba59f8f1f241beb8f56..6a02b0eede00a6e0d771cf40c9c78c4357d5fc7d 100644 (file)
--- a/test/Preprocessor/print_line_count.c
+++ b/test/Preprocessor/print_line_count.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E -C -P %s | wc -l | grep 4
+/* RUN: %clang -E -C -P %s | wc -l | grep 4
    PR2741
    comment */ 
 y

diff --git a/test/Preprocessor/x86_target_features.c b/test/Preprocessor/x86_target_features.c
index f8574e25d4747eae7e008f46d62f42def1acb000..f39c2208a4c1800ab6ddebca2b922532a8e157e9 100644 (file)
--- a/test/Preprocessor/x86_target_features.c
+++ b/test/Preprocessor/x86_target_features.c
@@ -1,6 +1,6 @@
 // FIXME: Use -triple, not -ccc-host-triple.
 
-// RUN: clang -ccc-host-triple i386-unknown-unknown -march=core2 -msse4 -x c -E -dM -o %t %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -march=core2 -msse4 -x c -E -dM -o %t %s
 // RUN: grep '#define __SSE2_MATH__ 1' %t
 // RUN: grep '#define __SSE2__ 1' %t
 // RUN: grep '#define __SSE3__ 1' %t
@@ -10,7 +10,7 @@
 // RUN: grep '#define __SSE__ 1' %t
 // RUN: grep '#define __SSSE3__ 1' %t
 
-// RUN: clang -ccc-host-triple i386-unknown-unknown -march=core2 -msse4 -mno-sse2 -x c -E -dM -o %t %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -march=core2 -msse4 -mno-sse2 -x c -E -dM -o %t %s
 // RUN: grep '#define __SSE2_MATH__ 1' %t | count 0
 // RUN: grep '#define __SSE2__ 1' %t | count 0
 // RUN: grep '#define __SSE3__ 1' %t | count 0
@@ -20,7 +20,7 @@
 // RUN: grep '#define __SSE__ 1' %t
 // RUN: grep '#define __SSSE3__ 1' %t | count 0
 
-// RUN: clang -ccc-host-triple i386-unknown-unknown -march=pentium-m -x c -E -dM -o %t %s
+// RUN: %clang -ccc-host-triple i386-unknown-unknown -march=pentium-m -x c -E -dM -o %t %s
 // RUN: grep '#define __SSE2_MATH__ 1' %t
 // RUN: grep '#define __SSE2__ 1' %t
 // RUN: grep '#define __SSE3__ 1' %t | count 0

diff --git a/test/Sema/attr-malloc.c b/test/Sema/attr-malloc.c
index 6483ffc4c1a65d7239680beaf4535ff049169b49..9970b9de4f95af6619c1e52c96c61e473c35671f 100644 (file)
--- a/test/Sema/attr-malloc.c
+++ b/test/Sema/attr-malloc.c
@@ -1,5 +1,5 @@
-// RUN: clang -Xclang -verify -fsyntax-only %s
-// RUN: clang -emit-llvm -S -o %t %s
+// RUN: %clang -Xclang -verify -fsyntax-only %s
+// RUN: %clang -emit-llvm -S -o %t %s
 
 #include <stdlib.h>
 

diff --git a/test/Sema/i-c-e.c b/test/Sema/i-c-e.c
index 6e14833166d802e1f835a954ca8b7efb6c0e44d0..c561fe01c6eeda28592af615c60a05240b9df94d 100644 (file)
--- a/test/Sema/i-c-e.c
+++ b/test/Sema/i-c-e.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -Xclang -verify -pedantic -fpascal-strings
+// RUN: %clang %s -fsyntax-only -Xclang -verify -pedantic -fpascal-strings
 
 #include <stdint.h>
 #include <limits.h>

diff --git a/test/Sema/return.c b/test/Sema/return.c
index 2e8120a7542e4f60038382e53d2c0c016de783b7..a1d9e5eeedd0f7591a053fe4e9c0bd74e089ceae 100644 (file)
--- a/test/Sema/return.c
+++ b/test/Sema/return.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -Xclang -verify -fblocks
+// RUN: %clang %s -fsyntax-only -Xclang -verify -fblocks
 
 // clang emits the following warning by default.
 // With GCC, -pedantic, -Wreturn-type or -Wall are required to produce the 

diff --git a/test/Sema/shift.c b/test/Sema/shift.c
index fdfebc589a77bc5fae012d5e057e015c2cfae661..558a7d20065a27bd2f8eceb4f4da3f41691961f3 100644 (file)
--- a/test/Sema/shift.c
+++ b/test/Sema/shift.c
@@ -1,4 +1,4 @@
-// RUN: clang -Wall -fsyntax-only -Xclang -verify %s
+// RUN: %clang -Wall -fsyntax-only -Xclang -verify %s
 
 #include <limits.h>
 

diff --git a/test/Sema/surpress-deprecated.c b/test/Sema/surpress-deprecated.c
index 8dbe9dd36581370854e1667a9884329cb8445132..78faf22328a43ba10b1290f366010228f534a022 100644 (file)
--- a/test/Sema/surpress-deprecated.c
+++ b/test/Sema/surpress-deprecated.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Wno-deprecated-declarations -verify %s
+// RUN: %clang -fsyntax-only -Wno-deprecated-declarations -verify %s
 extern void OldFunction() __attribute__((deprecated));
 
 int main (int argc, const char * argv[]) {

diff --git a/test/Sema/transparent-union.c b/test/Sema/transparent-union.c
index 90ecaadea6e774e7ff18b9c6da1f46630313562c..03f6a53d059a04834c5cb6084c4980a65290a1b2 100644 (file)
--- a/test/Sema/transparent-union.c
+++ b/test/Sema/transparent-union.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Xclang -verify %s
+// RUN: %clang -fsyntax-only -Xclang -verify %s
 typedef union {
   int *ip;
   float *fp;

diff --git a/test/Sema/warn-missing-prototypes.c b/test/Sema/warn-missing-prototypes.c
index 299d8a726585bce004f36d7da61d3087f1554166..bfd1459b41d0b7f2da3a57d37359d640b601ed3e 100644 (file)
--- a/test/Sema/warn-missing-prototypes.c
+++ b/test/Sema/warn-missing-prototypes.c
@@ -1,4 +1,4 @@
-// RUN: clang -Wmissing-prototypes -fsyntax-only -Xclang -verify %s
+// RUN: %clang -Wmissing-prototypes -fsyntax-only -Xclang -verify %s
 
 int f();
 

diff --git a/test/Sema/warn-unused-parameters.c b/test/Sema/warn-unused-parameters.c
index afb95166cbce2b72c37198d649379a208bcf5890..c6458cf9712bcb687ced717e7b8d1c315fb18798 100644 (file)
--- a/test/Sema/warn-unused-parameters.c
+++ b/test/Sema/warn-unused-parameters.c
@@ -1,4 +1,4 @@
-// RUN: clang -fblocks -fsyntax-only -Wunused-parameter %s -Xclang -verify
+// RUN: %clang -fblocks -fsyntax-only -Wunused-parameter %s -Xclang -verify
 
 int f0(int x,
        int y, // expected-warning{{unused}}

diff --git a/test/Sema/wchar.c b/test/Sema/wchar.c
index ed6649a31d981b2b448281b708e4180afa65c0e9..edec2b30cea98bc2a247e9a2da16d836c8e5fd43 100644 (file)
--- a/test/Sema/wchar.c
+++ b/test/Sema/wchar.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -fsyntax-only -Xclang -verify
-// RUN: clang %s -fsyntax-only -fshort-wchar -Xclang -verify -DSHORT_WCHAR
+// RUN: %clang %s -fsyntax-only -Xclang -verify
+// RUN: %clang %s -fsyntax-only -fshort-wchar -Xclang -verify -DSHORT_WCHAR
 
 typedef __WCHAR_TYPE__ wchar_t;
 

diff --git a/test/Sema/x86-intrinsics-headers.c b/test/Sema/x86-intrinsics-headers.c
index 5b43e2bd07a40e3bd16fb19d3db184ef2db124e7..006716ef5ba4d6b8e099c54cb8f1e22d908bd2fc 100644 (file)
--- a/test/Sema/x86-intrinsics-headers.c
+++ b/test/Sema/x86-intrinsics-headers.c
@@ -1,6 +1,6 @@
-// RUN: clang -fsyntax-only %s
-// RUN: clang -fsyntax-only -fno-lax-vector-conversions %s
-// RUN: clang -fsyntax-only -x c++ %s
+// RUN: %clang -fsyntax-only %s
+// RUN: %clang -fsyntax-only -fno-lax-vector-conversions %s
+// RUN: %clang -fsyntax-only -x c++ %s
 
 #if defined(i386) || defined(__x86_64__)
 

diff --git a/test/SemaCXX/warn-unused-variables.cpp b/test/SemaCXX/warn-unused-variables.cpp
index 019863686d328728c6ea6d3df7c5c8f6398651af..83a61bf8e007a06b1f923ecb0aac303f1ce05353 100644 (file)
--- a/test/SemaCXX/warn-unused-variables.cpp
+++ b/test/SemaCXX/warn-unused-variables.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -Wunused-variable -verify %s
+// RUN: %clang -fsyntax-only -Wunused-variable -verify %s
 
 template<typename T> void f() {
        T t;

diff --git a/test/SemaTemplate/example-dynarray.cpp b/test/SemaTemplate/example-dynarray.cpp
index 6f3e58e32ab68a1fc0d8398b70bcb06993be7590..1f6ede67a5225f5cb9e4c95ffb966066adab83b0 100644 (file)
--- a/test/SemaTemplate/example-dynarray.cpp
+++ b/test/SemaTemplate/example-dynarray.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -emit-llvm -S -o %t %s
+// RUN: %clang -emit-llvm -S -o %t %s
 #include <stddef.h>
 #include <stdlib.h>
 #include <assert.h>

diff --git a/test/lit.cfg b/test/lit.cfg
index c561dd8a785b62485d97e55f09578b062cd6d030..4d7a17a6b5d68d2c51fe2408769b70f4fba3a0fb 100644 (file)
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -122,6 +122,15 @@ def inferClang(PATH):
 config.clang = inferClang(config.environment['PATH'])
 if not lit.quiet:
     lit.note('using clang: %r' % config.clang)
-config.substitutions.append( (' clang ', ' ' + config.clang + ' ') )
 config.substitutions.append( ('%clang_cc1', config.clang + ' -cc1') )
-
+config.substitutions.append( ('%clang', ' ' + config.clang + ' ') )
+
+# FIXME: Find nicer way to prohibit this.
+config.substitutions.append(
+    (' clang ', """*** Do not use 'clang' in tests, use '%clang'. ***""") )
+config.substitutions.append(
+    (' clang-cc ',
+     """*** Do not use 'clang-cc' in tests, use '%clang_cc1'. ***""") )
+config.substitutions.append(
+    (' clang -cc1 ',
+     """*** Do not use 'clang -cc1' in tests, use '%clang_cc1'. ***""") )