Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'.
- This is designed to make it obvious that %clang_cc1 is a "test variable"
which is substituted. It is '%clang_cc1' instead of '%clang -cc1' because it
can be useful to redefine what gets run as 'clang -cc1' (for example, to set
a default target).
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@91446 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Preprocessor/_Pragma-dependency.c b/test/Preprocessor/_Pragma-dependency.c
index 17c5355..a2861c9 100644
--- a/test/Preprocessor/_Pragma-dependency.c
+++ b/test/Preprocessor/_Pragma-dependency.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc %s -E 2>&1 | grep 'DO_PRAGMA (STR'
-// RUN: clang-cc %s -E 2>&1 | grep '7:3'
+// RUN: %clang_cc1 %s -E 2>&1 | grep 'DO_PRAGMA (STR'
+// RUN: %clang_cc1 %s -E 2>&1 | grep '7:3'
#define DO_PRAGMA _Pragma
#define STR "GCC dependency \"parse.y\"")
diff --git a/test/Preprocessor/_Pragma-dependency2.c b/test/Preprocessor/_Pragma-dependency2.c
index c21c7c8..c178764 100644
--- a/test/Preprocessor/_Pragma-dependency2.c
+++ b/test/Preprocessor/_Pragma-dependency2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s -verify
+// RUN: %clang_cc1 -E %s -verify
#define DO_PRAGMA _Pragma
DO_PRAGMA ("GCC dependency \"blahblabh\"") // expected-error {{file not found}}
diff --git a/test/Preprocessor/_Pragma-location.c b/test/Preprocessor/_Pragma-location.c
index 61cadfb..8b68d6c 100644
--- a/test/Preprocessor/_Pragma-location.c
+++ b/test/Preprocessor/_Pragma-location.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | not grep 'scratch space'
+// RUN: %clang_cc1 %s -E | not grep 'scratch space'
#define push _Pragma ("pack(push)")
push
diff --git a/test/Preprocessor/_Pragma-physloc.c b/test/Preprocessor/_Pragma-physloc.c
index 016c97b..a093af2 100644
--- a/test/Preprocessor/_Pragma-physloc.c
+++ b/test/Preprocessor/_Pragma-physloc.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc %s -E | grep '#pragma x y z'
-// RUN: clang-cc %s -E | grep '#pragma a b c'
+// RUN: %clang_cc1 %s -E | grep '#pragma x y z'
+// RUN: %clang_cc1 %s -E | grep '#pragma a b c'
_Pragma("x y z")
_Pragma("a b c")
diff --git a/test/Preprocessor/_Pragma.c b/test/Preprocessor/_Pragma.c
index 9c0c97d..0a83b14 100644
--- a/test/Preprocessor/_Pragma.c
+++ b/test/Preprocessor/_Pragma.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -Wall
+// RUN: %clang_cc1 %s -verify -Wall
_Pragma ("GCC system_header") // expected-warning {{system_header ignored in main file}}
diff --git a/test/Preprocessor/assembler-with-cpp.c b/test/Preprocessor/assembler-with-cpp.c
index 17880c8..0543077 100644
--- a/test/Preprocessor/assembler-with-cpp.c
+++ b/test/Preprocessor/assembler-with-cpp.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -x assembler-with-cpp -E %s -o - | FileCheck -strict-whitespace -check-prefix=CHECK-Identifiers-False %s
+// RUN: %clang_cc1 -x assembler-with-cpp -E %s -o - | FileCheck -strict-whitespace -check-prefix=CHECK-Identifiers-False %s
#ifndef __ASSEMBLER__
#error "__ASSEMBLER__ not defined"
@@ -49,7 +49,7 @@
6: FOO(blarg)
// CHECK-Identifiers-False: 6: blarg $foo
-// RUN: clang-cc -x assembler-with-cpp -fdollars-in-identifiers -E %s -o - | FileCheck -check-prefix=CHECK-Identifiers-True -strict-whitespace %s
+// RUN: %clang_cc1 -x assembler-with-cpp -fdollars-in-identifiers -E %s -o - | FileCheck -check-prefix=CHECK-Identifiers-True -strict-whitespace %s
#define FOO(name) name ## $foo
7: FOO(blarg)
// CHECK-Identifiers-True: 7: blarg$foo
diff --git a/test/Preprocessor/builtin_line.c b/test/Preprocessor/builtin_line.c
index 06a2ac2..52228b5 100644
--- a/test/Preprocessor/builtin_line.c
+++ b/test/Preprocessor/builtin_line.c
@@ -1,10 +1,10 @@
-// RUN: clang-cc %s -E | grep "^ 4"
+// RUN: %clang_cc1 %s -E | grep "^ 4"
#define FOO __LINE__
FOO
// PR3579 - This should expand to the __LINE__ of the ')' not of the X.
-// RUN: clang-cc %s -E | grep "^A 13"
+// RUN: %clang_cc1 %s -E | grep "^A 13"
#define X() __LINE__
diff --git a/test/Preprocessor/c90.c b/test/Preprocessor/c90.c
index ed63d1b..1d5010d 100644
--- a/test/Preprocessor/c90.c
+++ b/test/Preprocessor/c90.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc %s -std=c89 -Eonly -verify -pedantic-errors
+/* RUN: %clang_cc1 %s -std=c89 -Eonly -verify -pedantic-errors
*/
/* PR3919 */
diff --git a/test/Preprocessor/c99-6_10_3_3_p4.c b/test/Preprocessor/c99-6_10_3_3_p4.c
index 99ad6e8..320e6cf 100644
--- a/test/Preprocessor/c99-6_10_3_3_p4.c
+++ b/test/Preprocessor/c99-6_10_3_3_p4.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -strict-whitespace %s
#define hash_hash # ## #
#define mkstr(a) # a
diff --git a/test/Preprocessor/c99-6_10_3_4_p5.c b/test/Preprocessor/c99-6_10_3_4_p5.c
index 08b2c42..6dea09d 100644
--- a/test/Preprocessor/c99-6_10_3_4_p5.c
+++ b/test/Preprocessor/c99-6_10_3_4_p5.c
@@ -1,5 +1,5 @@
// Example from C99 6.10.3.4p5
-// RUN: clang-cc -E %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -strict-whitespace %s
#define x 3
#define f(a) f(x * (a))
diff --git a/test/Preprocessor/c99-6_10_3_4_p6.c b/test/Preprocessor/c99-6_10_3_4_p6.c
index 8072d7b..98bacb2 100644
--- a/test/Preprocessor/c99-6_10_3_4_p6.c
+++ b/test/Preprocessor/c99-6_10_3_4_p6.c
@@ -1,6 +1,6 @@
// Example from C99 6.10.3.4p6
-// RUN: clang-cc -E %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -strict-whitespace %s
#define str(s) # s
#define xstr(s) str(s)
diff --git a/test/Preprocessor/c99-6_10_3_4_p7.c b/test/Preprocessor/c99-6_10_3_4_p7.c
index 6a7eb48..b63209b 100644
--- a/test/Preprocessor/c99-6_10_3_4_p7.c
+++ b/test/Preprocessor/c99-6_10_3_4_p7.c
@@ -1,6 +1,6 @@
// Example from C99 6.10.3.4p7
-// RUN: clang-cc -E %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -strict-whitespace %s
#define t(x,y,z) x ## y ## z
int j[] = { t(1,2,3), t(,4,5), t(6,,7), t(8,9,),
diff --git a/test/Preprocessor/c99-6_10_3_4_p9.c b/test/Preprocessor/c99-6_10_3_4_p9.c
index 704241e..04c4b79 100644
--- a/test/Preprocessor/c99-6_10_3_4_p9.c
+++ b/test/Preprocessor/c99-6_10_3_4_p9.c
@@ -1,6 +1,6 @@
// Example from C99 6.10.3.4p9
-// RUN: clang-cc -E %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -strict-whitespace %s
#define debug(...) fprintf(stderr, __VA_ARGS__)
#define showlist(...) puts(#__VA_ARGS__)
diff --git a/test/Preprocessor/clang_headers.c b/test/Preprocessor/clang_headers.c
index 1cb3319..f2dec4f 100644
--- a/test/Preprocessor/clang_headers.c
+++ b/test/Preprocessor/clang_headers.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -E %s
+// RUN: %clang_cc1 -E %s
#include <limits.h>
diff --git a/test/Preprocessor/comment_save.c b/test/Preprocessor/comment_save.c
index ae609b1..b860042 100644
--- a/test/Preprocessor/comment_save.c
+++ b/test/Preprocessor/comment_save.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -C %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E -C %s | FileCheck -strict-whitespace %s
// foo
// CHECK: // foo
diff --git a/test/Preprocessor/comment_save_if.c b/test/Preprocessor/comment_save_if.c
index c08b2d7..2f35bcb 100644
--- a/test/Preprocessor/comment_save_if.c
+++ b/test/Preprocessor/comment_save_if.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E -CC -pedantic 2>&1 | grep -v '^/' | not grep warning
+// RUN: %clang_cc1 %s -E -CC -pedantic 2>&1 | grep -v '^/' | not grep warning
#if 1 /*bar */
diff --git a/test/Preprocessor/comment_save_macro.c b/test/Preprocessor/comment_save_macro.c
index 76a21bf..6ad759f 100644
--- a/test/Preprocessor/comment_save_macro.c
+++ b/test/Preprocessor/comment_save_macro.c
@@ -1,10 +1,10 @@
-// RUN: clang-cc -E -C %s | FileCheck -check-prefix=CHECK-C -strict-whitespace %s
+// RUN: %clang_cc1 -E -C %s | FileCheck -check-prefix=CHECK-C -strict-whitespace %s
// CHECK-C: boo bork bar // zot
-// RUN: clang-cc -E -CC %s | FileCheck -check-prefix=CHECK-CC -strict-whitespace %s
+// RUN: %clang_cc1 -E -CC %s | FileCheck -check-prefix=CHECK-CC -strict-whitespace %s
// CHECK-CC: boo bork /* blah*/ bar // zot
-// RUN: clang-cc -E %s | FileCheck -check-prefix=CHECK -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -check-prefix=CHECK -strict-whitespace %s
// CHECK: boo bork bar
diff --git a/test/Preprocessor/cxx_and.cpp b/test/Preprocessor/cxx_and.cpp
index 7470913..a84ffe7 100644
--- a/test/Preprocessor/cxx_and.cpp
+++ b/test/Preprocessor/cxx_and.cpp
@@ -1,7 +1,7 @@
-// RUN: clang-cc -DA -DB -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DA -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -DB -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA -DB -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DB -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -E %s | grep 'int a = 927 == 927'
#if defined(A) and defined(B)
#define X 37
#else
diff --git a/test/Preprocessor/cxx_bitand.cpp b/test/Preprocessor/cxx_bitand.cpp
index e6b7c2c..01b4ff1 100644
--- a/test/Preprocessor/cxx_bitand.cpp
+++ b/test/Preprocessor/cxx_bitand.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -DA=1 -DB=2 -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA=1 -DB=2 -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -E %s | grep 'int a = 927 == 927'
#if A bitand B
#define X 37
#else
diff --git a/test/Preprocessor/cxx_bitor.cpp b/test/Preprocessor/cxx_bitor.cpp
index e72fcb4..c92596e 100644
--- a/test/Preprocessor/cxx_bitor.cpp
+++ b/test/Preprocessor/cxx_bitor.cpp
@@ -1,8 +1,8 @@
-// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -E %s | grep 'int a = 927 == 927'
#if A bitor B
#define X 37
#else
diff --git a/test/Preprocessor/cxx_compl.cpp b/test/Preprocessor/cxx_compl.cpp
index b319c51..824092c 100644
--- a/test/Preprocessor/cxx_compl.cpp
+++ b/test/Preprocessor/cxx_compl.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -DA=1 -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DA=0 -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA=1 -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA=0 -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -E %s | grep 'int a = 927 == 927'
#if compl 0 bitand A
#define X 37
#else
diff --git a/test/Preprocessor/cxx_not.cpp b/test/Preprocessor/cxx_not.cpp
index 2272941..67e8775 100644
--- a/test/Preprocessor/cxx_not.cpp
+++ b/test/Preprocessor/cxx_not.cpp
@@ -1,5 +1,5 @@
-// RUN: clang-cc -DA=1 -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA=1 -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -E %s | grep 'int a = 37 == 37'
#if not defined(A)
#define X 37
#else
diff --git a/test/Preprocessor/cxx_not_eq.cpp b/test/Preprocessor/cxx_not_eq.cpp
index 92418b2..f7670fa 100644
--- a/test/Preprocessor/cxx_not_eq.cpp
+++ b/test/Preprocessor/cxx_not_eq.cpp
@@ -1,6 +1,6 @@
-// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -DA=1 -DB=2 -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA=1 -DB=2 -E %s | grep 'int a = 37 == 37'
#if A not_eq B
#define X 37
#else
diff --git a/test/Preprocessor/cxx_oper_keyword.cpp b/test/Preprocessor/cxx_oper_keyword.cpp
index 0464e97..3fc246d 100644
--- a/test/Preprocessor/cxx_oper_keyword.cpp
+++ b/test/Preprocessor/cxx_oper_keyword.cpp
@@ -1,5 +1,5 @@
-// RUN: not clang-cc %s -E
-// RUN: clang-cc %s -E -fno-operator-names
+// RUN: not %clang_cc1 %s -E
+// RUN: %clang_cc1 %s -E -fno-operator-names
// Not valid in C++ unless -fno-operator-names is passed.
#define and foo
diff --git a/test/Preprocessor/cxx_oper_spelling.cpp b/test/Preprocessor/cxx_oper_spelling.cpp
index 85f0426..0ae9afd 100644
--- a/test/Preprocessor/cxx_oper_spelling.cpp
+++ b/test/Preprocessor/cxx_oper_spelling.cpp
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep 'a: "and"'
+// RUN: %clang_cc1 -E %s | grep 'a: "and"'
#define X(A) #A
diff --git a/test/Preprocessor/cxx_or.cpp b/test/Preprocessor/cxx_or.cpp
index 2f7c0a5..e8ed92f 100644
--- a/test/Preprocessor/cxx_or.cpp
+++ b/test/Preprocessor/cxx_or.cpp
@@ -1,7 +1,7 @@
-// RUN: clang-cc -DA -DB -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DA -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DB -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA -DB -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DB -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -E %s | grep 'int a = 927 == 927'
#if defined(A) or defined(B)
#define X 37
#else
diff --git a/test/Preprocessor/cxx_true.cpp b/test/Preprocessor/cxx_true.cpp
index bca70c5..b123e0c 100644
--- a/test/Preprocessor/cxx_true.cpp
+++ b/test/Preprocessor/cxx_true.cpp
@@ -1,6 +1,6 @@
-/* RUN: clang-cc -E %s -x c++ | grep block_1
- RUN: clang-cc -E %s -x c++ | not grep block_2
- RUN: clang-cc -E %s -x c | not grep block
+/* RUN: %clang_cc1 -E %s -x c++ | grep block_1
+ RUN: %clang_cc1 -E %s -x c++ | not grep block_2
+ RUN: %clang_cc1 -E %s -x c | not grep block
*/
#if true
diff --git a/test/Preprocessor/cxx_xor.cpp b/test/Preprocessor/cxx_xor.cpp
index e6df9bb..24a6ce4 100644
--- a/test/Preprocessor/cxx_xor.cpp
+++ b/test/Preprocessor/cxx_xor.cpp
@@ -1,8 +1,8 @@
-// RUN: clang-cc -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37'
-// RUN: clang-cc -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927'
-// RUN: clang-cc -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37'
+// RUN: %clang_cc1 -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927'
+// RUN: %clang_cc1 -E %s | grep 'int a = 927 == 927'
#if A xor B
#define X 37
#else
diff --git a/test/Preprocessor/disabled-cond-diags.c b/test/Preprocessor/disabled-cond-diags.c
index eb7632f..531842a 100644
--- a/test/Preprocessor/disabled-cond-diags.c
+++ b/test/Preprocessor/disabled-cond-diags.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s 2>&1 | not grep "warning\|error"
+// RUN: %clang_cc1 -E %s 2>&1 | not grep "warning\|error"
#if 0
diff --git a/test/Preprocessor/dump-macros-spacing.c b/test/Preprocessor/dump-macros-spacing.c
index 335e37c..1392442 100644
--- a/test/Preprocessor/dump-macros-spacing.c
+++ b/test/Preprocessor/dump-macros-spacing.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -dD < %s | grep stdin | grep -v define
+// RUN: %clang_cc1 -E -dD < %s | grep stdin | grep -v define
#define A A
/* 1
* 2
diff --git a/test/Preprocessor/dump_macros.c b/test/Preprocessor/dump_macros.c
index 5908fec..d420eb4 100644
--- a/test/Preprocessor/dump_macros.c
+++ b/test/Preprocessor/dump_macros.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -dM %s -o - | FileCheck %s -strict-whitespace
+// RUN: %clang_cc1 -E -dM %s -o - | FileCheck %s -strict-whitespace
// Space at end even without expansion tokens
// CHECK: #define A(x)
diff --git a/test/Preprocessor/dumptokens_phyloc.c b/test/Preprocessor/dumptokens_phyloc.c
index c0e78c9..7321c0e 100644
--- a/test/Preprocessor/dumptokens_phyloc.c
+++ b/test/Preprocessor/dumptokens_phyloc.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -dump-tokens %s 2>&1 | grep "Spelling=.*dumptokens_phyloc.c:3:20"
+// RUN: %clang_cc1 -dump-tokens %s 2>&1 | grep "Spelling=.*dumptokens_phyloc.c:3:20"
#define TESTPHYLOC 10
diff --git a/test/Preprocessor/expr_comma.c b/test/Preprocessor/expr_comma.c
index 88ceabf..538727d 100644
--- a/test/Preprocessor/expr_comma.c
+++ b/test/Preprocessor/expr_comma.c
@@ -1,8 +1,8 @@
// Comma is not allowed in C89
-// RUN: not clang-cc -E %s -std=c89 -pedantic-errors
+// RUN: not %clang_cc1 -E %s -std=c89 -pedantic-errors
// Comma is allowed if unevaluated in C99
-// RUN: clang-cc -E %s -std=c99 -pedantic-errors
+// RUN: %clang_cc1 -E %s -std=c99 -pedantic-errors
// PR2279
diff --git a/test/Preprocessor/expr_invalid_tok.c b/test/Preprocessor/expr_invalid_tok.c
index 8bc2b8e..5defcc5 100644
--- a/test/Preprocessor/expr_invalid_tok.c
+++ b/test/Preprocessor/expr_invalid_tok.c
@@ -1,6 +1,6 @@
-// RUN: not clang-cc -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression'
-// RUN: not clang-cc -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression'
-// RUN: not clang-cc -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
+// RUN: not %clang_cc1 -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression'
+// RUN: not %clang_cc1 -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression'
+// RUN: not %clang_cc1 -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
// PR2220
#if 1 * * 2
diff --git a/test/Preprocessor/expr_liveness.c b/test/Preprocessor/expr_liveness.c
index d44b196..c3b6421 100644
--- a/test/Preprocessor/expr_liveness.c
+++ b/test/Preprocessor/expr_liveness.c
@@ -1,5 +1,5 @@
-/* RUN: clang-cc -E %s -DNO_ERRORS -Werror -Wundef
- RUN: not clang-cc -E %s
+/* RUN: %clang_cc1 -E %s -DNO_ERRORS -Werror -Wundef
+ RUN: not %clang_cc1 -E %s
*/
#ifdef NO_ERRORS
diff --git a/test/Preprocessor/expr_multichar.c b/test/Preprocessor/expr_multichar.c
index 4df8f3d..8ab12d9 100644
--- a/test/Preprocessor/expr_multichar.c
+++ b/test/Preprocessor/expr_multichar.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc < %s -E -verify -triple i686-pc-linux-gnu
+// RUN: %clang_cc1 < %s -E -verify -triple i686-pc-linux-gnu
#if (('1234' >> 24) != '1')
#error Bad multichar constant calculation!
diff --git a/test/Preprocessor/expr_usual_conversions.c b/test/Preprocessor/expr_usual_conversions.c
index 47aca7b..b1bddd3 100644
--- a/test/Preprocessor/expr_usual_conversions.c
+++ b/test/Preprocessor/expr_usual_conversions.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E 2>&1 | grep warning | wc -l | grep 2
+// RUN: %clang_cc1 %s -E 2>&1 | grep warning | wc -l | grep 2
#define INTMAX_MIN (-9223372036854775807LL -1)
diff --git a/test/Preprocessor/extension-warning.c b/test/Preprocessor/extension-warning.c
index 7b5095f..4ba57f7 100644
--- a/test/Preprocessor/extension-warning.c
+++ b/test/Preprocessor/extension-warning.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s
// The preprocessor shouldn't warn about extensions within macro bodies that
// aren't expanded.
diff --git a/test/Preprocessor/feature_tests.c b/test/Preprocessor/feature_tests.c
index 9ccff0e..35592bd 100644
--- a/test/Preprocessor/feature_tests.c
+++ b/test/Preprocessor/feature_tests.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc %s -triple=i686-apple-darwin9
-// RUN: clang-cc %s -E -triple=i686-apple-darwin9
+// RUN: %clang_cc1 %s -triple=i686-apple-darwin9
+// RUN: %clang_cc1 %s -E -triple=i686-apple-darwin9
#ifndef __has_feature
#error Should have __has_feature
#endif
diff --git a/test/Preprocessor/function_macro_file.c b/test/Preprocessor/function_macro_file.c
index 6a266dd..c97bb75 100644
--- a/test/Preprocessor/function_macro_file.c
+++ b/test/Preprocessor/function_macro_file.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc -E -P %s | grep f
+/* RUN: %clang_cc1 -E -P %s | grep f
*/
#include "function_macro_file.h"
diff --git a/test/Preprocessor/has_include.c b/test/Preprocessor/has_include.c
index 40697c0..c34c348 100644
--- a/test/Preprocessor/has_include.c
+++ b/test/Preprocessor/has_include.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -Eonly -verify %s
+// RUN: %clang_cc1 -Eonly -verify %s
// Try different path permutations of __has_include with existing file.
#if __has_include("stdio.h")
diff --git a/test/Preprocessor/hash_line.c b/test/Preprocessor/hash_line.c
index 31f708c..4f724df 100644
--- a/test/Preprocessor/hash_line.c
+++ b/test/Preprocessor/hash_line.c
@@ -1,7 +1,7 @@
// The 1 and # should not go on the same line.
-// RUN: clang-cc %s -E | not grep "1 #"
-// RUN: clang-cc %s -E | grep '^1$'
-// RUN: clang-cc %s -E | grep '^ #$'
+// RUN: %clang_cc1 %s -E | not grep "1 #"
+// RUN: %clang_cc1 %s -E | grep '^1$'
+// RUN: %clang_cc1 %s -E | grep '^ #$'
1
#define EMPTY
EMPTY #
diff --git a/test/Preprocessor/hash_space.c b/test/Preprocessor/hash_space.c
index e7dbd3b..ac97556 100644
--- a/test/Preprocessor/hash_space.c
+++ b/test/Preprocessor/hash_space.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | grep " #"
+// RUN: %clang_cc1 %s -E | grep " #"
// Should put a space before the # so that -fpreprocessed mode doesn't
// macro expand this again.
diff --git a/test/Preprocessor/if_warning.c b/test/Preprocessor/if_warning.c
index 2ce7b31..98653a8 100644
--- a/test/Preprocessor/if_warning.c
+++ b/test/Preprocessor/if_warning.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc %s -Eonly -Werror=undef -verify
-// RUN: clang-cc %s -Eonly -Werror-undef -verify
+// RUN: %clang_cc1 %s -Eonly -Werror=undef -verify
+// RUN: %clang_cc1 %s -Eonly -Werror-undef -verify
extern int x;
diff --git a/test/Preprocessor/ifdef-recover.c b/test/Preprocessor/ifdef-recover.c
index 3fffcc0..51d06d1 100644
--- a/test/Preprocessor/ifdef-recover.c
+++ b/test/Preprocessor/ifdef-recover.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc -E %s 2>&1 >/dev/null | grep error: | count 3
+/* RUN: %clang_cc1 -E %s 2>&1 >/dev/null | grep error: | count 3
*/
#ifdef
diff --git a/test/Preprocessor/import_self.c b/test/Preprocessor/import_self.c
index 2cabe3d..8ba0b19 100644
--- a/test/Preprocessor/import_self.c
+++ b/test/Preprocessor/import_self.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -I. %s | grep BODY_OF_FILE | wc -l | grep 1
+// RUN: %clang_cc1 -E -I. %s | grep BODY_OF_FILE | wc -l | grep 1
// This #import should have no effect, as we're importing the current file.
#import <import_self.c>
diff --git a/test/Preprocessor/include-directive1.c b/test/Preprocessor/include-directive1.c
index 66f70fb..20f4582 100644
--- a/test/Preprocessor/include-directive1.c
+++ b/test/Preprocessor/include-directive1.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 3
+// RUN: %clang_cc1 -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 3
// XX expands to nothing.
#define XX
diff --git a/test/Preprocessor/include-directive2.c b/test/Preprocessor/include-directive2.c
index 1239982..b205325 100644
--- a/test/Preprocessor/include-directive2.c
+++ b/test/Preprocessor/include-directive2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -Eonly -verify %s
+// RUN: %clang_cc1 -Eonly -verify %s
# define HEADER <float.h>
# include HEADER
diff --git a/test/Preprocessor/include-directive3.c b/test/Preprocessor/include-directive3.c
index e5b7a94..c0e2ae1 100644
--- a/test/Preprocessor/include-directive3.c
+++ b/test/Preprocessor/include-directive3.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -include %S/file_to_include.h -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 1
+// RUN: %clang_cc1 -include %S/file_to_include.h -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 1
// PR3464
diff --git a/test/Preprocessor/include-macros.c b/test/Preprocessor/include-macros.c
index d64ee5e..b86cd0d 100644
--- a/test/Preprocessor/include-macros.c
+++ b/test/Preprocessor/include-macros.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -Dtest=FOO -imacros %S/pr2086.h %s | grep 'HERE: test'
+// RUN: %clang_cc1 -E -Dtest=FOO -imacros %S/pr2086.h %s | grep 'HERE: test'
// This should not be expanded into FOO because pr2086.h undefs 'test'.
HERE: test
diff --git a/test/Preprocessor/include-pth.c b/test/Preprocessor/include-pth.c
index 5634d71..e1d6685 100644
--- a/test/Preprocessor/include-pth.c
+++ b/test/Preprocessor/include-pth.c
@@ -1,3 +1,3 @@
-// RUN: clang-cc -emit-pth %s -o %t
-// RUN: clang-cc -include-pth %t %s -E | grep 'file_to_include' | count 2
+// RUN: %clang_cc1 -emit-pth %s -o %t
+// RUN: %clang_cc1 -include-pth %t %s -E | grep 'file_to_include' | count 2
#include "file_to_include.h"
diff --git a/test/Preprocessor/indent_macro.c b/test/Preprocessor/indent_macro.c
index f6b411e..e695007 100644
--- a/test/Preprocessor/indent_macro.c
+++ b/test/Preprocessor/indent_macro.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep '^ zzap$'
+// RUN: %clang_cc1 -E %s | grep '^ zzap$'
// zzap is on a new line, should be indented.
#define BLAH zzap
diff --git a/test/Preprocessor/init.c b/test/Preprocessor/init.c
index 163734e..ac0f63a 100644
--- a/test/Preprocessor/init.c
+++ b/test/Preprocessor/init.c
@@ -1,15 +1,15 @@
-// RUN: clang-cc -E -dM -x assembler-with-cpp < /dev/null | FileCheck -check-prefix ASM %s
+// RUN: %clang_cc1 -E -dM -x assembler-with-cpp < /dev/null | FileCheck -check-prefix ASM %s
//
// ASM:#define __ASSEMBLER__ 1
//
//
-// RUN: clang-cc -fblocks -E -dM < /dev/null | FileCheck -check-prefix BLOCKS %s
+// RUN: %clang_cc1 -fblocks -E -dM < /dev/null | FileCheck -check-prefix BLOCKS %s
//
// BLOCKS:#define __BLOCKS__ 1
// BLOCKS:#define __block __attribute__((__blocks__(byref)))
//
//
-// RUN: clang-cc -x c++ -std=c++0x -E -dM < /dev/null | FileCheck -check-prefix CXX0X %s
+// RUN: %clang_cc1 -x c++ -std=c++0x -E -dM < /dev/null | FileCheck -check-prefix CXX0X %s
//
// CXX0X:#define _GNU_SOURCE 1
// CXX0X:#define __DEPRECATED 1
@@ -20,7 +20,7 @@
// CXX0X:#define __private_extern__ extern
//
//
-// RUN: clang-cc -x c++ -std=c++98 -E -dM < /dev/null | FileCheck -check-prefix CXX98 %s
+// RUN: %clang_cc1 -x c++ -std=c++98 -E -dM < /dev/null | FileCheck -check-prefix CXX98 %s
//
// CXX98:#define _GNU_SOURCE 1
// CXX98:#define __DEPRECATED 1
@@ -30,13 +30,13 @@
// CXX98:#define __private_extern__ extern
//
//
-// RUN: clang-cc -std=c99 -E -dM < /dev/null | FileCheck -check-prefix C99 %s
+// RUN: %clang_cc1 -std=c99 -E -dM < /dev/null | FileCheck -check-prefix C99 %s
//
// C99:#define __STDC_VERSION__ 199901L
// C99:#define __STRICT_ANSI__ 1
//
//
-// RUN: clang-cc -E -dM < /dev/null | FileCheck -check-prefix COMMON %s
+// RUN: %clang_cc1 -E -dM < /dev/null | FileCheck -check-prefix COMMON %s
//
// COMMON:#define __CONSTANT_CFSTRINGS__ 1
// COMMON:#define __FINITE_MATH_ONLY__ 0
@@ -53,10 +53,10 @@
// COMMON:#define __llvm__ 1
//
//
-// RUN: clang-cc -ffreestanding -E -dM < /dev/null | FileCheck -check-prefix FREESTANDING %s
+// RUN: %clang_cc1 -ffreestanding -E -dM < /dev/null | FileCheck -check-prefix FREESTANDING %s
// FREESTANDING:#define __STDC_HOSTED__ 0
//
-// RUN: clang-cc -x c++ -std=gnu++98 -E -dM < /dev/null | FileCheck -check-prefix GXX98 %s
+// RUN: %clang_cc1 -x c++ -std=gnu++98 -E -dM < /dev/null | FileCheck -check-prefix GXX98 %s
//
// GXX98:#define _GNU_SOURCE 1
// GXX98:#define __DEPRECATED 1
@@ -66,12 +66,12 @@
// GXX98:#define __private_extern__ extern
//
//
-// RUN: clang-cc -std=iso9899:199409 -E -dM < /dev/null | FileCheck -check-prefix C94 %s
+// RUN: %clang_cc1 -std=iso9899:199409 -E -dM < /dev/null | FileCheck -check-prefix C94 %s
//
// C94:#define __STDC_VERSION__ 199409L
//
//
-// RUN: clang-cc -fms-extensions -E -dM < /dev/null | FileCheck -check-prefix MSEXT %s
+// RUN: %clang_cc1 -fms-extensions -E -dM < /dev/null | FileCheck -check-prefix MSEXT %s
//
// MSEXT-NOT:#define __STDC__
// MSEXT:#define __int16 __INT16_TYPE__
@@ -80,41 +80,41 @@
// MSEXT:#define __int8 __INT8_TYPE__
//
//
-// RUN: clang-cc -x objective-c -E -dM < /dev/null | FileCheck -check-prefix OBJC %s
+// RUN: %clang_cc1 -x objective-c -E -dM < /dev/null | FileCheck -check-prefix OBJC %s
//
// OBJC:#define OBJC_NEW_PROPERTIES 1
// OBJC:#define __NEXT_RUNTIME__ 1
// OBJC:#define __OBJC__ 1
//
//
-// RUN: clang-cc -x objective-c -fobjc-gc -E -dM < /dev/null | FileCheck -check-prefix OBJCGC %s
+// RUN: %clang_cc1 -x objective-c -fobjc-gc -E -dM < /dev/null | FileCheck -check-prefix OBJCGC %s
//
// OBJCGC:#define __OBJC_GC__ 1
//
//
-// RUN: clang-cc -x objective-c -fobjc-nonfragile-abi -E -dM < /dev/null | FileCheck -check-prefix NONFRAGILE %s
+// RUN: %clang_cc1 -x objective-c -fobjc-nonfragile-abi -E -dM < /dev/null | FileCheck -check-prefix NONFRAGILE %s
//
// NONFRAGILE:#define OBJC_ZEROCOST_EXCEPTIONS 1
// NONFRAGILE:#define __OBJC2__ 1
//
//
-// RUN: clang-cc -O1 -E -dM < /dev/null | FileCheck -check-prefix O1 %s
+// RUN: %clang_cc1 -O1 -E -dM < /dev/null | FileCheck -check-prefix O1 %s
//
// O1:#define __OPTIMIZE__ 1
//
//
-// RUN: clang-cc -fpascal-strings -E -dM < /dev/null | FileCheck -check-prefix PASCAL %s
+// RUN: %clang_cc1 -fpascal-strings -E -dM < /dev/null | FileCheck -check-prefix PASCAL %s
//
// PASCAL:#define __PASCAL_STRINGS__ 1
//
//
-// RUN: clang-cc -E -dM < /dev/null | FileCheck -check-prefix SCHAR %s
+// RUN: %clang_cc1 -E -dM < /dev/null | FileCheck -check-prefix SCHAR %s
//
// SCHAR:#define __STDC__ 1
// SCHAR-NOT:#define __UNSIGNED_CHAR__
// SCHAR:#define __clang__ 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=arm-none-none < /dev/null | FileCheck -check-prefix ARM %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=arm-none-none < /dev/null | FileCheck -check-prefix ARM %s
//
// ARM:#define __APCS_32__ 1
// ARM:#define __ARMEL__ 1
@@ -197,7 +197,7 @@
// ARM:#define __arm 1
// ARM:#define __arm__ 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=bfin-none-none < /dev/null | FileCheck -check-prefix BFIN %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=bfin-none-none < /dev/null | FileCheck -check-prefix BFIN %s
//
// BFIN:#define BFIN 1
// BFIN:#define __ADSPBLACKFIN__ 1
@@ -280,7 +280,7 @@
// BFIN:#define __bfin__ 1
// BFIN:#define bfin 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=i386-none-none < /dev/null | FileCheck -check-prefix I386 %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=i386-none-none < /dev/null | FileCheck -check-prefix I386 %s
//
// I386:#define __CHAR_BIT__ 8
// I386:#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
@@ -364,7 +364,7 @@
// I386:#define __tune_nocona__ 1
// I386:#define i386 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=msp430-none-none < /dev/null | FileCheck -check-prefix MSP430 %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=msp430-none-none < /dev/null | FileCheck -check-prefix MSP430 %s
//
// MSP430:#define MSP430 1
// MSP430:#define __CHAR_BIT__ 8
@@ -441,7 +441,7 @@
// MSP430:#define __WINT_WIDTH__ 16
// MSP430:#define __clang__ 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=pic16-none-none < /dev/null | FileCheck -check-prefix PIC16 %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=pic16-none-none < /dev/null | FileCheck -check-prefix PIC16 %s
//
// PIC16:#define _CONFIG(conf) asm("CONFIG "#conf)
// PIC16:#define __CHAR_BIT__ 8
@@ -524,7 +524,7 @@
// PIC16:#define ram __attribute__((address_space(0)))
// PIC16:#define rom __attribute__((address_space(1)))
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=powerpc64-none-none -fno-signed-char < /dev/null | FileCheck -check-prefix PPC64 %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc64-none-none -fno-signed-char < /dev/null | FileCheck -check-prefix PPC64 %s
//
// PPC64:#define _ARCH_PPC 1
// PPC64:#define _ARCH_PPC64 1
@@ -612,7 +612,7 @@
// PPC64:#define __ppc64__ 1
// PPC64:#define __ppc__ 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=powerpc-none-none -fno-signed-char < /dev/null | FileCheck -check-prefix PPC %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=powerpc-none-none -fno-signed-char < /dev/null | FileCheck -check-prefix PPC %s
//
// PPC:#define _ARCH_PPC 1
// PPC:#define _BIG_ENDIAN 1
@@ -696,7 +696,7 @@
// PPC:#define __WINT_WIDTH__ 32
// PPC:#define __ppc__ 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=s390x-none-none -fno-signed-char < /dev/null | FileCheck -check-prefix S390X %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=s390x-none-none -fno-signed-char < /dev/null | FileCheck -check-prefix S390X %s
//
// S390X:#define __CHAR_BIT__ 8
// S390X:#define __CHAR_UNSIGNED__ 1
@@ -774,7 +774,7 @@
// S390X:#define __s390__ 1
// S390X:#define __s390x__ 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=sparc-none-none < /dev/null | FileCheck -check-prefix SPARC %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=sparc-none-none < /dev/null | FileCheck -check-prefix SPARC %s
//
// SPARC:#define __CHAR_BIT__ 8
// SPARC:#define __DBL_DENORM_MIN__ 4.9406564584124654e-324
@@ -855,7 +855,7 @@
// SPARC:#define __sparcv8 1
// SPARC:#define sparc 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=tce-none-none < /dev/null | FileCheck -check-prefix TCE %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=tce-none-none < /dev/null | FileCheck -check-prefix TCE %s
//
// TCE:#define __CHAR_BIT__ 8
// TCE:#define __DBL_DENORM_MIN__ 1.40129846e-45F
@@ -933,7 +933,7 @@
// TCE:#define __tce__ 1
// TCE:#define tce 1
//
-// RUN: clang-cc -E -dM -ffreestanding -triple=x86_64-none-none < /dev/null | FileCheck -check-prefix X86_64 %s
+// RUN: %clang_cc1 -E -dM -ffreestanding -triple=x86_64-none-none < /dev/null | FileCheck -check-prefix X86_64 %s
//
// X86_64:#define _LP64 1
// X86_64:#define __CHAR_BIT__ 8
diff --git a/test/Preprocessor/line-directive.c b/test/Preprocessor/line-directive.c
index 33dd9bb..878d067 100644
--- a/test/Preprocessor/line-directive.c
+++ b/test/Preprocessor/line-directive.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic %s
-// RUN: clang-cc -E %s 2>&1 | grep 'blonk.c:92:2: error: #error ABC'
-// RUN: clang-cc -E %s 2>&1 | grep 'blonk.c:93:2: error: #error DEF'
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -E %s 2>&1 | grep 'blonk.c:92:2: error: #error ABC'
+// RUN: %clang_cc1 -E %s 2>&1 | grep 'blonk.c:93:2: error: #error DEF'
#line 'a' // expected-error {{#line directive requires a positive integer argument}}
#line 0 // expected-error {{#line directive requires a positive integer argument}}
diff --git a/test/Preprocessor/macro_arg_keyword.c b/test/Preprocessor/macro_arg_keyword.c
index 92b1ae5..b9bbbf3 100644
--- a/test/Preprocessor/macro_arg_keyword.c
+++ b/test/Preprocessor/macro_arg_keyword.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep xxx-xxx
+// RUN: %clang_cc1 -E %s | grep xxx-xxx
#define foo(return) return-return
diff --git a/test/Preprocessor/macro_disable.c b/test/Preprocessor/macro_disable.c
index f102ddd..d6509c3 100644
--- a/test/Preprocessor/macro_disable.c
+++ b/test/Preprocessor/macro_disable.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -E %s | grep 'a: 2 + M_0(3)(4)(5);'
-// RUN: clang-cc -E %s | grep 'b: 4 + 4 + 3 + 2 + 1 + M_0(3)(2)(1);'
+// RUN: %clang_cc1 -E %s | grep 'a: 2 + M_0(3)(4)(5);'
+// RUN: %clang_cc1 -E %s | grep 'b: 4 + 4 + 3 + 2 + 1 + M_0(3)(2)(1);'
#define M_0(x) M_ ## x
#define M_1(x) x + M_0(0)
diff --git a/test/Preprocessor/macro_disable2.c b/test/Preprocessor/macro_disable2.c
index 286539e..229cf32 100644
--- a/test/Preprocessor/macro_disable2.c
+++ b/test/Preprocessor/macro_disable2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep 'A B C A B A C A B C A'
+// RUN: %clang_cc1 -E %s | grep 'A B C A B A C A B C A'
#define A A B C
#define B B C A
diff --git a/test/Preprocessor/macro_disable3.c b/test/Preprocessor/macro_disable3.c
index d4a5664..eab0a5e 100644
--- a/test/Preprocessor/macro_disable3.c
+++ b/test/Preprocessor/macro_disable3.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 %s -E | FileCheck -strict-whitespace %s
// Check for C99 6.10.3.4p2.
#define f(a) f(x * (a))
diff --git a/test/Preprocessor/macro_disable4.c b/test/Preprocessor/macro_disable4.c
index b652b98..820858c 100644
--- a/test/Preprocessor/macro_disable4.c
+++ b/test/Preprocessor/macro_disable4.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -P -E %s | grep 'int f(void)'
+// RUN: %clang_cc1 -P -E %s | grep 'int f(void)'
// PR1820
#define f(x) h(x
diff --git a/test/Preprocessor/macro_expand.c b/test/Preprocessor/macro_expand.c
index a93c04e..4dc0357 100644
--- a/test/Preprocessor/macro_expand.c
+++ b/test/Preprocessor/macro_expand.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -E %s | grep '^A: Y$'
-// RUN: clang-cc -E %s | grep '^B: f()$'
-// RUN: clang-cc -E %s | grep '^C: for()$'
+// RUN: %clang_cc1 -E %s | grep '^A: Y$'
+// RUN: %clang_cc1 -E %s | grep '^B: f()$'
+// RUN: %clang_cc1 -E %s | grep '^C: for()$'
#define X() Y
#define Y() X
diff --git a/test/Preprocessor/macro_expandloc.c b/test/Preprocessor/macro_expandloc.c
index ce1efd2..f466013 100644
--- a/test/Preprocessor/macro_expandloc.c
+++ b/test/Preprocessor/macro_expandloc.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E 2>&1 | grep '#include'
+// RUN: %clang_cc1 %s -E 2>&1 | grep '#include'
#define FOO 1
// The error message should be on the #include line, not the 1.
diff --git a/test/Preprocessor/macro_expandloc2.c b/test/Preprocessor/macro_expandloc2.c
index 9adf3fd..4aa7dfe 100644
--- a/test/Preprocessor/macro_expandloc2.c
+++ b/test/Preprocessor/macro_expandloc2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E 2>&1 | grep '#include'
+// RUN: %clang_cc1 %s -E 2>&1 | grep '#include'
#define FOO BAR
// The error message should be on the #include line, not the 1.
diff --git a/test/Preprocessor/macro_fn.c b/test/Preprocessor/macro_fn.c
index 5c55c0c..85733b4 100644
--- a/test/Preprocessor/macro_fn.c
+++ b/test/Preprocessor/macro_fn.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc %s -Eonly -std=c89 -pedantic -verify
+/* RUN: %clang_cc1 %s -Eonly -std=c89 -pedantic -verify
*/
/* PR3937 */
#define zero() 0
diff --git a/test/Preprocessor/macro_fn_comma_swallow.c b/test/Preprocessor/macro_fn_comma_swallow.c
index c98e378..5742591 100644
--- a/test/Preprocessor/macro_fn_comma_swallow.c
+++ b/test/Preprocessor/macro_fn_comma_swallow.c
@@ -1,7 +1,7 @@
// Test the GNU comma swallowing extension.
-// RUN: clang-cc %s -E | grep 'foo{A, }'
-// RUN: clang-cc %s -E | grep 'fo2{A,}'
-// RUN: clang-cc %s -E | grep '{foo}'
+// RUN: %clang_cc1 %s -E | grep 'foo{A, }'
+// RUN: %clang_cc1 %s -E | grep 'fo2{A,}'
+// RUN: %clang_cc1 %s -E | grep '{foo}'
#define X(Y) foo{A, Y}
X()
@@ -15,7 +15,7 @@
-// RUN: clang-cc %s -E | grep 'AA BB'
+// RUN: %clang_cc1 %s -E | grep 'AA BB'
// PR3880
#define X4(...) AA , ## __VA_ARGS__ BB
X4()
diff --git a/test/Preprocessor/macro_fn_disable_expand.c b/test/Preprocessor/macro_fn_disable_expand.c
index d40ee2a..16948dc 100644
--- a/test/Preprocessor/macro_fn_disable_expand.c
+++ b/test/Preprocessor/macro_fn_disable_expand.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | FileCheck %s
+// RUN: %clang_cc1 %s -E | FileCheck %s
#define foo(x) bar x
foo(foo) (2)
diff --git a/test/Preprocessor/macro_fn_lparen_scan.c b/test/Preprocessor/macro_fn_lparen_scan.c
index 77e1fb9..0218469 100644
--- a/test/Preprocessor/macro_fn_lparen_scan.c
+++ b/test/Preprocessor/macro_fn_lparen_scan.c
@@ -1,7 +1,7 @@
-// RUN: clang-cc -E %s | grep 'noexp: foo y'
-// RUN: clang-cc -E %s | grep 'expand: abc'
-// RUN: clang-cc -E %s | grep 'noexp2: foo nonexp'
-// RUN: clang-cc -E %s | grep 'expand2: abc'
+// RUN: %clang_cc1 -E %s | grep 'noexp: foo y'
+// RUN: %clang_cc1 -E %s | grep 'expand: abc'
+// RUN: %clang_cc1 -E %s | grep 'noexp2: foo nonexp'
+// RUN: %clang_cc1 -E %s | grep 'expand2: abc'
#define A foo
#define foo() abc
diff --git a/test/Preprocessor/macro_fn_lparen_scan2.c b/test/Preprocessor/macro_fn_lparen_scan2.c
index fb64bef..c23e741 100644
--- a/test/Preprocessor/macro_fn_lparen_scan2.c
+++ b/test/Preprocessor/macro_fn_lparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep 'FUNC (3 +1);'
+// RUN: %clang_cc1 -E %s | grep 'FUNC (3 +1);'
#define F(a) a
#define FUNC(a) (a+1)
diff --git a/test/Preprocessor/macro_fn_placemarker.c b/test/Preprocessor/macro_fn_placemarker.c
index ff688ce..1791054 100644
--- a/test/Preprocessor/macro_fn_placemarker.c
+++ b/test/Preprocessor/macro_fn_placemarker.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | grep 'foo(A, )'
+// RUN: %clang_cc1 %s -E | grep 'foo(A, )'
#define X(Y) foo(A, Y)
X()
diff --git a/test/Preprocessor/macro_fn_preexpand.c b/test/Preprocessor/macro_fn_preexpand.c
index ac3b353..1b94c82 100644
--- a/test/Preprocessor/macro_fn_preexpand.c
+++ b/test/Preprocessor/macro_fn_preexpand.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc %s -E | grep 'pre: 1 1 X'
-// RUN: clang-cc %s -E | grep 'nopre: 1A(X)'
+// RUN: %clang_cc1 %s -E | grep 'pre: 1 1 X'
+// RUN: %clang_cc1 %s -E | grep 'nopre: 1A(X)'
/* Preexpansion of argument. */
#define A(X) 1 X
diff --git a/test/Preprocessor/macro_fn_varargs_iso.c b/test/Preprocessor/macro_fn_varargs_iso.c
index b1e5c52..a1aab26 100644
--- a/test/Preprocessor/macro_fn_varargs_iso.c
+++ b/test/Preprocessor/macro_fn_varargs_iso.c
@@ -1,7 +1,7 @@
-// RUN: clang-cc -E %s | grep 'foo{a, b, c, d, e}'
-// RUN: clang-cc -E %s | grep 'foo2{d, C, B}'
-// RUN: clang-cc -E %s | grep 'foo2{d,e, C, B}'
+// RUN: %clang_cc1 -E %s | grep 'foo{a, b, c, d, e}'
+// RUN: %clang_cc1 -E %s | grep 'foo2{d, C, B}'
+// RUN: %clang_cc1 -E %s | grep 'foo2{d,e, C, B}'
#define va1(...) foo{a, __VA_ARGS__, e}
va1(b, c, d)
diff --git a/test/Preprocessor/macro_fn_varargs_named.c b/test/Preprocessor/macro_fn_varargs_named.c
index 94770a2..b50d53d 100644
--- a/test/Preprocessor/macro_fn_varargs_named.c
+++ b/test/Preprocessor/macro_fn_varargs_named.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -E %s | grep '^a: x$'
-// RUN: clang-cc -E %s | grep '^b: x y, z,h$'
-// RUN: clang-cc -E %s | grep '^c: foo(x)$'
+// RUN: %clang_cc1 -E %s | grep '^a: x$'
+// RUN: %clang_cc1 -E %s | grep '^b: x y, z,h$'
+// RUN: %clang_cc1 -E %s | grep '^c: foo(x)$'
#define A(b, c...) b c
a: A(x)
diff --git a/test/Preprocessor/macro_misc.c b/test/Preprocessor/macro_misc.c
index 169c5ec..53d9982 100644
--- a/test/Preprocessor/macro_misc.c
+++ b/test/Preprocessor/macro_misc.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -Eonly -verify
+// RUN: %clang_cc1 %s -Eonly -verify
// This should not be rejected.
#ifdef defined
diff --git a/test/Preprocessor/macro_not_define.c b/test/Preprocessor/macro_not_define.c
index a42240b..82648d4 100644
--- a/test/Preprocessor/macro_not_define.c
+++ b/test/Preprocessor/macro_not_define.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep '^ # define X 3$'
+// RUN: %clang_cc1 -E %s | grep '^ # define X 3$'
#define H #
#define D define
diff --git a/test/Preprocessor/macro_paste_bad.c b/test/Preprocessor/macro_paste_bad.c
index 1212c44..2af0173 100644
--- a/test/Preprocessor/macro_paste_bad.c
+++ b/test/Preprocessor/macro_paste_bad.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -Eonly -verify -pedantic %s
+// RUN: %clang_cc1 -Eonly -verify -pedantic %s
// pasting ""x"" and ""+"" does not give a valid preprocessing token
#define XYZ x ## +
XYZ // expected-error {{pasting formed 'x+', an invalid preprocessing token}}
diff --git a/test/Preprocessor/macro_paste_bcpl_comment.c b/test/Preprocessor/macro_paste_bcpl_comment.c
index 8bbee5d..fd07b1f 100644
--- a/test/Preprocessor/macro_paste_bcpl_comment.c
+++ b/test/Preprocessor/macro_paste_bcpl_comment.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -Eonly 2>&1 | grep error
+// RUN: %clang_cc1 %s -Eonly 2>&1 | grep error
#define COMM1 / ## /
COMM1
diff --git a/test/Preprocessor/macro_paste_c_block_comment.c b/test/Preprocessor/macro_paste_c_block_comment.c
index 2e5a214..3441f27 100644
--- a/test/Preprocessor/macro_paste_c_block_comment.c
+++ b/test/Preprocessor/macro_paste_c_block_comment.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc %s -Eonly 2>&1 | grep error
-// RUN: clang-cc %s -Eonly 2>&1 | not grep unterminated
-// RUN: clang-cc %s -Eonly 2>&1 | not grep scratch
+// RUN: %clang_cc1 %s -Eonly 2>&1 | grep error
+// RUN: %clang_cc1 %s -Eonly 2>&1 | not grep unterminated
+// RUN: %clang_cc1 %s -Eonly 2>&1 | not grep scratch
#define COMM / ## *
COMM
diff --git a/test/Preprocessor/macro_paste_commaext.c b/test/Preprocessor/macro_paste_commaext.c
index fe9c92a..7cfe43d 100644
--- a/test/Preprocessor/macro_paste_commaext.c
+++ b/test/Preprocessor/macro_paste_commaext.c
@@ -1,8 +1,8 @@
-// RUN: clang-cc %s -E | grep 'V);'
-// RUN: clang-cc %s -E | grep 'W, 1, 2);'
-// RUN: clang-cc %s -E | grep 'X, 1, 2);'
-// RUN: clang-cc %s -E | grep 'Y, );'
-// RUN: clang-cc %s -E | grep 'Z, );'
+// RUN: %clang_cc1 %s -E | grep 'V);'
+// RUN: %clang_cc1 %s -E | grep 'W, 1, 2);'
+// RUN: %clang_cc1 %s -E | grep 'X, 1, 2);'
+// RUN: %clang_cc1 %s -E | grep 'Y, );'
+// RUN: %clang_cc1 %s -E | grep 'Z, );'
#define debug(format, ...) format, ## __VA_ARGS__)
debug(V);
diff --git a/test/Preprocessor/macro_paste_empty.c b/test/Preprocessor/macro_paste_empty.c
index 41843cd..2e26f14 100644
--- a/test/Preprocessor/macro_paste_empty.c
+++ b/test/Preprocessor/macro_paste_empty.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -E %s | grep 'a:Y'
-// RUN: clang-cc -E %s | grep 'b:Y'
-// RUN: clang-cc -E %s | grep 'c:YY'
+// RUN: %clang_cc1 -E %s | grep 'a:Y'
+// RUN: %clang_cc1 -E %s | grep 'b:Y'
+// RUN: %clang_cc1 -E %s | grep 'c:YY'
#define FOO(X) X ## Y
a:FOO()
diff --git a/test/Preprocessor/macro_paste_hard.c b/test/Preprocessor/macro_paste_hard.c
index adc447c..fad8426 100644
--- a/test/Preprocessor/macro_paste_hard.c
+++ b/test/Preprocessor/macro_paste_hard.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -E %s | grep '1: aaab 2'
-// RUN: clang-cc -E %s | grep '2: 2 baaa'
-// RUN: clang-cc -E %s | grep '3: 2 xx'
+// RUN: %clang_cc1 -E %s | grep '1: aaab 2'
+// RUN: %clang_cc1 -E %s | grep '2: 2 baaa'
+// RUN: %clang_cc1 -E %s | grep '3: 2 xx'
#define a(n) aaa ## n
#define b 2
diff --git a/test/Preprocessor/macro_paste_hashhash.c b/test/Preprocessor/macro_paste_hashhash.c
index 42654fd..e7993cc 100644
--- a/test/Preprocessor/macro_paste_hashhash.c
+++ b/test/Preprocessor/macro_paste_hashhash.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep '^"x ## y";$'
+// RUN: %clang_cc1 -E %s | grep '^"x ## y";$'
#define hash_hash # ## #
#define mkstr(a) # a
#define in_between(a) mkstr(a)
diff --git a/test/Preprocessor/macro_paste_mscomment.c b/test/Preprocessor/macro_paste_mscomment.c
index ecd0b9d..7132406 100644
--- a/test/Preprocessor/macro_paste_mscomment.c
+++ b/test/Preprocessor/macro_paste_mscomment.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -P -E -fms-extensions %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -P -E -fms-extensions %s | FileCheck -strict-whitespace %s
// This horrible stuff should preprocess into (other than whitespace):
// int foo;
// int bar;
diff --git a/test/Preprocessor/macro_paste_none.c b/test/Preprocessor/macro_paste_none.c
index e978fca..97ccd7c 100644
--- a/test/Preprocessor/macro_paste_none.c
+++ b/test/Preprocessor/macro_paste_none.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep '!!'
+// RUN: %clang_cc1 -E %s | grep '!!'
#define A(B,C) B ## C
diff --git a/test/Preprocessor/macro_paste_simple.c b/test/Preprocessor/macro_paste_simple.c
index 2affbac..563d7f4 100644
--- a/test/Preprocessor/macro_paste_simple.c
+++ b/test/Preprocessor/macro_paste_simple.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | grep "barbaz123"
+// RUN: %clang_cc1 %s -E | grep "barbaz123"
#define FOO bar ## baz ## 123
diff --git a/test/Preprocessor/macro_paste_spacing.c b/test/Preprocessor/macro_paste_spacing.c
index 130548d..6498ffc 100644
--- a/test/Preprocessor/macro_paste_spacing.c
+++ b/test/Preprocessor/macro_paste_spacing.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | grep "^xy$"
+// RUN: %clang_cc1 %s -E | grep "^xy$"
#define A x ## y
blah
diff --git a/test/Preprocessor/macro_paste_spacing2.c b/test/Preprocessor/macro_paste_spacing2.c
index 0db721a..02cc12f 100644
--- a/test/Preprocessor/macro_paste_spacing2.c
+++ b/test/Preprocessor/macro_paste_spacing2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | grep "movl %eax"
+// RUN: %clang_cc1 %s -E | grep "movl %eax"
// PR4132
#define R1E %eax
#define epilogue(r1) movl r1 ## E;
diff --git a/test/Preprocessor/macro_rescan.c b/test/Preprocessor/macro_rescan.c
index c6a807a..3a38548 100644
--- a/test/Preprocessor/macro_rescan.c
+++ b/test/Preprocessor/macro_rescan.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -E %s | grep 'ei_1 = (17 +1);'
-// RUN: clang-cc -E %s | grep 'ei_2 = (M1)(17);'
+// RUN: %clang_cc1 -E %s | grep 'ei_1 = (17 +1);'
+// RUN: %clang_cc1 -E %s | grep 'ei_2 = (M1)(17);'
#define M1(a) (a+1)
#define M2(b) b
diff --git a/test/Preprocessor/macro_rescan2.c b/test/Preprocessor/macro_rescan2.c
index 9c198c9..826f4ee 100644
--- a/test/Preprocessor/macro_rescan2.c
+++ b/test/Preprocessor/macro_rescan2.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc %s -E | grep 'a: 2\*f(9)'
-// RUN: clang-cc %s -E | grep 'b: 2\*9\*g'
+// RUN: %clang_cc1 %s -E | grep 'a: 2\*f(9)'
+// RUN: %clang_cc1 %s -E | grep 'b: 2\*9\*g'
#define f(a) a*g
#define g f
diff --git a/test/Preprocessor/macro_rescan_varargs.c b/test/Preprocessor/macro_rescan_varargs.c
index 8a3ad15..6c6415a 100644
--- a/test/Preprocessor/macro_rescan_varargs.c
+++ b/test/Preprocessor/macro_rescan_varargs.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -strict-whitespace %s
#define LPAREN (
#define RPAREN )
diff --git a/test/Preprocessor/macro_rparen_scan.c b/test/Preprocessor/macro_rparen_scan.c
index 9275098..e4de5db 100644
--- a/test/Preprocessor/macro_rparen_scan.c
+++ b/test/Preprocessor/macro_rparen_scan.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep '^3 ;$'
+// RUN: %clang_cc1 -E %s | grep '^3 ;$'
/* Right paren scanning, hard case. Should expand to 3. */
#define i(x) 3
diff --git a/test/Preprocessor/macro_rparen_scan2.c b/test/Preprocessor/macro_rparen_scan2.c
index c7fb9e3..42aa544 100644
--- a/test/Preprocessor/macro_rparen_scan2.c
+++ b/test/Preprocessor/macro_rparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -strict-whitespace %s
#define R_PAREN )
diff --git a/test/Preprocessor/macro_space.c b/test/Preprocessor/macro_space.c
index 4fdbb0a..49a9a0f 100644
--- a/test/Preprocessor/macro_space.c
+++ b/test/Preprocessor/macro_space.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -E | grep '! ,'
+// RUN: %clang_cc1 %s -E | grep '! ,'
#define XX
! XX,
diff --git a/test/Preprocessor/macro_undef.c b/test/Preprocessor/macro_undef.c
index 4507cdd..c842c85 100644
--- a/test/Preprocessor/macro_undef.c
+++ b/test/Preprocessor/macro_undef.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -dM -undef -Dfoo=1 -E %s | FileCheck %s
+// RUN: %clang_cc1 -dM -undef -Dfoo=1 -E %s | FileCheck %s
// CHECK-NOT: #define __clang__
// CHECK: #define foo 1
diff --git a/test/Preprocessor/mi_opt.c b/test/Preprocessor/mi_opt.c
index aa69e2b..597ac07 100644
--- a/test/Preprocessor/mi_opt.c
+++ b/test/Preprocessor/mi_opt.c
@@ -1,4 +1,4 @@
-// RUN: not clang-cc -fsyntax-only %s
+// RUN: not %clang_cc1 -fsyntax-only %s
// PR1900
// This test should get a redefinition error from m_iopt.h: the MI opt
// shouldn't apply.
diff --git a/test/Preprocessor/non_fragile_feature.m b/test/Preprocessor/non_fragile_feature.m
index dbf1f9a..552209d 100644
--- a/test/Preprocessor/non_fragile_feature.m
+++ b/test/Preprocessor/non_fragile_feature.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -fobjc-nonfragile-abi %s
+// RUN: %clang_cc1 -fobjc-nonfragile-abi %s
#ifndef __has_feature
#error Should have __has_feature
#endif
diff --git a/test/Preprocessor/non_fragile_feature1.m b/test/Preprocessor/non_fragile_feature1.m
index 5943e01..89b52ed 100644
--- a/test/Preprocessor/non_fragile_feature1.m
+++ b/test/Preprocessor/non_fragile_feature1.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 -triple i386-unknown-unknown %s
+// RUN: %clang_cc1 -triple i386-unknown-unknown %s
#ifndef __has_feature
#error Should have __has_feature
#endif
diff --git a/test/Preprocessor/objc-pp.m b/test/Preprocessor/objc-pp.m
index 9f375ef..3e09325 100644
--- a/test/Preprocessor/objc-pp.m
+++ b/test/Preprocessor/objc-pp.m
@@ -1,4 +1,4 @@
-// RUN: clang -cc1 %s -fsyntax-only -verify -pedantic
+// RUN: %clang_cc1 %s -fsyntax-only -verify -pedantic
#import <stdint.h> // no warning on #import in objc mode.
diff --git a/test/Preprocessor/optimize.c b/test/Preprocessor/optimize.c
index 973d27f..c820ded 100644
--- a/test/Preprocessor/optimize.c
+++ b/test/Preprocessor/optimize.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -Eonly %s -DOPT_O2 -O2 -verify
+// RUN: %clang_cc1 -Eonly %s -DOPT_O2 -O2 -verify
#ifdef OPT_O2
#ifndef __OPTIMIZE__
#error "__OPTIMIZE__ not defined"
@@ -8,7 +8,7 @@
#endif
#endif
-// RUN: clang-cc -Eonly %s -DOPT_O0 -O0 -verify
+// RUN: %clang_cc1 -Eonly %s -DOPT_O0 -O0 -verify
#ifdef OPT_O0
#ifdef __OPTIMIZE__
#error "__OPTIMIZE__ defined"
@@ -18,7 +18,7 @@
#endif
#endif
-// RUN: clang-cc -Eonly %s -DOPT_OS -Os -verify
+// RUN: %clang_cc1 -Eonly %s -DOPT_OS -Os -verify
#ifdef OPT_OS
#ifndef __OPTIMIZE__
#error "__OPTIMIZE__ not defined"
diff --git a/test/Preprocessor/output_paste_avoid.c b/test/Preprocessor/output_paste_avoid.c
index 200ced9..835a921 100644
--- a/test/Preprocessor/output_paste_avoid.c
+++ b/test/Preprocessor/output_paste_avoid.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s -o - | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s -o - | FileCheck -strict-whitespace %s
#define y(a) ..a
diff --git a/test/Preprocessor/overflow.c b/test/Preprocessor/overflow.c
index 297a35e..a921441 100644
--- a/test/Preprocessor/overflow.c
+++ b/test/Preprocessor/overflow.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -Eonly %s -verify -triple i686-pc-linux-gnu
+// RUN: %clang_cc1 -Eonly %s -verify -triple i686-pc-linux-gnu
// Multiply signed overflow
#if 0x7FFFFFFFFFFFFFFF*2 // expected-warning {{overflow}}
diff --git a/test/Preprocessor/pr2086.c b/test/Preprocessor/pr2086.c
index 4df65a4..d438e87 100644
--- a/test/Preprocessor/pr2086.c
+++ b/test/Preprocessor/pr2086.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s
+// RUN: %clang_cc1 -E %s
#define test
#include "pr2086.h"
diff --git a/test/Preprocessor/pragma_microsoft.c b/test/Preprocessor/pragma_microsoft.c
index 81e90e3..0201c45 100644
--- a/test/Preprocessor/pragma_microsoft.c
+++ b/test/Preprocessor/pragma_microsoft.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify -fms-extensions
+// RUN: %clang_cc1 %s -fsyntax-only -verify -fms-extensions
// rdar://6495941
diff --git a/test/Preprocessor/pragma_poison.c b/test/Preprocessor/pragma_poison.c
index d91feb7..5b39183 100644
--- a/test/Preprocessor/pragma_poison.c
+++ b/test/Preprocessor/pragma_poison.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -Eonly -verify
+// RUN: %clang_cc1 %s -Eonly -verify
#pragma GCC poison rindex
rindex(some_string, 'h'); // expected-error {{attempt to use a poisoned identifier}}
diff --git a/test/Preprocessor/pragma_unknown.c b/test/Preprocessor/pragma_unknown.c
index c0355e7..c185153 100644
--- a/test/Preprocessor/pragma_unknown.c
+++ b/test/Preprocessor/pragma_unknown.c
@@ -1,5 +1,5 @@
-// RUN: clang-cc -E %s | grep '#pragma foo bar'
-// RUN: clang-cc -fsyntax-only -Wunknown-pragmas -verify %s
+// RUN: %clang_cc1 -E %s | grep '#pragma foo bar'
+// RUN: %clang_cc1 -fsyntax-only -Wunknown-pragmas -verify %s
// GCC doesn't expand macro args for unrecognized pragmas.
#define bar xX
diff --git a/test/Preprocessor/print_line_track.c b/test/Preprocessor/print_line_track.c
index 553c186..c87fe00 100644
--- a/test/Preprocessor/print_line_track.c
+++ b/test/Preprocessor/print_line_track.c
@@ -1,8 +1,8 @@
-/* RUN: clang-cc -E %s | grep 'a 3'
- * RUN: clang-cc -E %s | grep 'b 16'
- * RUN: clang-cc -E -P %s | grep 'a 3'
- * RUN: clang-cc -E -P %s | grep 'b 16'
- * RUN: clang-cc -E %s | not grep '# 0 '
+/* RUN: %clang_cc1 -E %s | grep 'a 3'
+ * RUN: %clang_cc1 -E %s | grep 'b 16'
+ * RUN: %clang_cc1 -E -P %s | grep 'a 3'
+ * RUN: %clang_cc1 -E -P %s | grep 'b 16'
+ * RUN: %clang_cc1 -E %s | not grep '# 0 '
* PR1848
* PR3437
*/
diff --git a/test/Preprocessor/pushable-diagnostics.c b/test/Preprocessor/pushable-diagnostics.c
index fe55122..6c861a1 100644
--- a/test/Preprocessor/pushable-diagnostics.c
+++ b/test/Preprocessor/pushable-diagnostics.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic %s
#pragma clang diagnostic pop // expected-warning{{pragma diagnostic pop could not pop, no matching push}}
diff --git a/test/Preprocessor/skipping_unclean.c b/test/Preprocessor/skipping_unclean.c
index 31ce9b4..52d1785 100644
--- a/test/Preprocessor/skipping_unclean.c
+++ b/test/Preprocessor/skipping_unclean.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep bark
+// RUN: %clang_cc1 -E %s | grep bark
#if 0
blah
diff --git a/test/Preprocessor/stdint.c b/test/Preprocessor/stdint.c
index 9304746..5f0842a 100644
--- a/test/Preprocessor/stdint.c
+++ b/test/Preprocessor/stdint.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -ffreestanding -triple=arm-none-none %s | FileCheck -check-prefix ARM %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=arm-none-none %s | FileCheck -check-prefix ARM %s
//
// ARM:typedef signed long long int int64_t;
// ARM:typedef unsigned long long int uint64_t;
@@ -106,7 +106,7 @@
// ARM:UINTMAX_C_(0) 0ULL
//
//
-// RUN: clang-cc -E -ffreestanding -triple=bfin-none-none %s | FileCheck -check-prefix BFIN %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=bfin-none-none %s | FileCheck -check-prefix BFIN %s
//
// BFIN:typedef signed long long int int64_t;
// BFIN:typedef unsigned long long int uint64_t;
@@ -214,7 +214,7 @@
// BFIN:UINTMAX_C_(0) 0ULL
//
//
-// RUN: clang-cc -E -ffreestanding -triple=i386-none-none %s | FileCheck -check-prefix I386 %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=i386-none-none %s | FileCheck -check-prefix I386 %s
//
// I386:typedef signed long long int int64_t;
// I386:typedef unsigned long long int uint64_t;
@@ -321,7 +321,7 @@
// I386:INTMAX_C_(0) 0LL
// I386:UINTMAX_C_(0) 0ULL
//
-// RUN: clang-cc -E -ffreestanding -triple=msp430-none-none %s | FileCheck -check-prefix MSP430 %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=msp430-none-none %s | FileCheck -check-prefix MSP430 %s
//
// MSP430:typedef signed long int int32_t;
// MSP430:typedef unsigned long int uint32_t;
@@ -421,7 +421,7 @@
// MSP430:INTMAX_C_(0) 0L
// MSP430:UINTMAX_C_(0) 0UL
//
-// RUN: clang-cc -E -ffreestanding -triple=pic16-none-none %s | FileCheck -check-prefix PIC16 %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=pic16-none-none %s | FileCheck -check-prefix PIC16 %s
//
// PIC16:typedef signed long int int32_t;
// PIC16:typedef unsigned long int uint32_t;
@@ -521,7 +521,7 @@
// PIC16:INTMAX_C_(0) 0L
// PIC16:UINTMAX_C_(0) 0UL
//
-// RUN: clang-cc -E -ffreestanding -triple=powerpc64-none-none %s | FileCheck -check-prefix PPC64 %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=powerpc64-none-none %s | FileCheck -check-prefix PPC64 %s
//
// PPC64:typedef signed long int int64_t;
// PPC64:typedef unsigned long int uint64_t;
@@ -628,7 +628,7 @@
// PPC64:INTMAX_C_(0) 0L
// PPC64:UINTMAX_C_(0) 0UL
//
-// RUN: clang-cc -E -ffreestanding -triple=powerpc-none-none %s | FileCheck -check-prefix PPC %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=powerpc-none-none %s | FileCheck -check-prefix PPC %s
//
//
// PPC:typedef signed long long int int64_t;
@@ -736,7 +736,7 @@
// PPC:INTMAX_C_(0) 0LL
// PPC:UINTMAX_C_(0) 0ULL
//
-// RUN: clang-cc -E -ffreestanding -triple=s390x-none-none %s | FileCheck -check-prefix S390X %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=s390x-none-none %s | FileCheck -check-prefix S390X %s
//
// S390X:typedef signed long int int64_t;
// S390X:typedef unsigned long int uint64_t;
@@ -843,7 +843,7 @@
// S390X:INTMAX_C_(0) 0L
// S390X:UINTMAX_C_(0) 0UL
//
-// RUN: clang-cc -E -ffreestanding -triple=sparc-none-none %s | FileCheck -check-prefix SPARC %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=sparc-none-none %s | FileCheck -check-prefix SPARC %s
//
// SPARC:typedef signed long long int int64_t;
// SPARC:typedef unsigned long long int uint64_t;
@@ -950,7 +950,7 @@
// SPARC:INTMAX_C_(0) 0LL
// SPARC:UINTMAX_C_(0) 0ULL
//
-// RUN: clang-cc -E -ffreestanding -triple=tce-none-none %s | FileCheck -check-prefix TCE %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=tce-none-none %s | FileCheck -check-prefix TCE %s
//
// TCE:typedef signed int int32_t;
// TCE:typedef unsigned int uint32_t;
@@ -1050,7 +1050,7 @@
// TCE:INTMAX_C_(0) 0
// TCE:UINTMAX_C_(0) 0U
//
-// RUN: clang-cc -E -ffreestanding -triple=x86_64-none-none %s | FileCheck -check-prefix X86_64 %s
+// RUN: %clang_cc1 -E -ffreestanding -triple=x86_64-none-none %s | FileCheck -check-prefix X86_64 %s
//
//
// X86_64:typedef signed long int int64_t;
@@ -1165,7 +1165,7 @@
// the identifiers used in the operations (int, uint, _t, INT, UINT, _MIN,
// _MAX, and _C(v)) are themselves macros.
//
-// RUN: clang-cc -E -ffreestanding -Dint=a -Duint=b -D_t=c -DINT=d -DUINT=e -D_MIN=f -D_MAX=g '-D_C(v)=h' -triple=i386-none-none %s | FileCheck -check-prefix JOIN %s
+// RUN: %clang_cc1 -E -ffreestanding -Dint=a -Duint=b -D_t=c -DINT=d -DUINT=e -D_MIN=f -D_MAX=g '-D_C(v)=h' -triple=i386-none-none %s | FileCheck -check-prefix JOIN %s
// JOIN:typedef int32_t intptr_t;
// JOIN:typedef uint32_t uintptr_t;
// JOIN:typedef int64_t intmax_t;
diff --git a/test/Preprocessor/stringize_misc.c b/test/Preprocessor/stringize_misc.c
index 60d66a0..6c2c78d 100644
--- a/test/Preprocessor/stringize_misc.c
+++ b/test/Preprocessor/stringize_misc.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | FileCheck -strict-whitespace %s
+// RUN: %clang_cc1 -E %s | FileCheck -strict-whitespace %s
#define M(x, y) #x #y
diff --git a/test/Preprocessor/stringize_space.c b/test/Preprocessor/stringize_space.c
index e41736c..263cff8 100644
--- a/test/Preprocessor/stringize_space.c
+++ b/test/Preprocessor/stringize_space.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s | grep -- '-"" , - "" , -"" , - ""'
+// RUN: %clang_cc1 -E %s | grep -- '-"" , - "" , -"" , - ""'
#define A(b) -#b , - #b , -# b , - # b
A()
diff --git a/test/Preprocessor/stringize_space2.c b/test/Preprocessor/stringize_space2.c
index 6a96894..a87d78e 100644
--- a/test/Preprocessor/stringize_space2.c
+++ b/test/Preprocessor/stringize_space2.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc -E %s | grep 'a c'
+/* RUN: %clang_cc1 -E %s | grep 'a c'
*/
#define t(x) #x
t(a
diff --git a/test/Preprocessor/undef-error.c b/test/Preprocessor/undef-error.c
index f818e59..ad611de 100644
--- a/test/Preprocessor/undef-error.c
+++ b/test/Preprocessor/undef-error.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -pedantic-errors -verify
+// RUN: %clang_cc1 %s -pedantic-errors -verify
// PR2045
#define b
diff --git a/test/Preprocessor/unterminated.c b/test/Preprocessor/unterminated.c
index 2040aac..9180653 100644
--- a/test/Preprocessor/unterminated.c
+++ b/test/Preprocessor/unterminated.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -verify %s
+// RUN: %clang_cc1 -E -verify %s
// PR3096
#ifdef FOO // expected-error {{unterminated conditional directive}}
/* /* */