Rename clang to clang-cc.
Tests and drivers updated, still need to shuffle dirs.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@67602 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Preprocessor/_Pragma-dependency.c b/test/Preprocessor/_Pragma-dependency.c
index 837f31d..da1d87f 100644
--- a/test/Preprocessor/_Pragma-dependency.c
+++ b/test/Preprocessor/_Pragma-dependency.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E 2>&1 | grep 'DO_PRAGMA (STR' &&
-// RUN: clang %s -E 2>&1 | grep '7:3'
+// RUN: clang-cc %s -E 2>&1 | grep 'DO_PRAGMA (STR' &&
+// RUN: clang-cc %s -E 2>&1 | grep '7:3'
#define DO_PRAGMA _Pragma
#define STR "GCC dependency \"parse.y\"")
diff --git a/test/Preprocessor/_Pragma-location.c b/test/Preprocessor/_Pragma-location.c
index 152e71a..61cadfb 100644
--- a/test/Preprocessor/_Pragma-location.c
+++ b/test/Preprocessor/_Pragma-location.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | not grep 'scratch space'
+// RUN: clang-cc %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 b8f5499..8737949 100644
--- a/test/Preprocessor/_Pragma-physloc.c
+++ b/test/Preprocessor/_Pragma-physloc.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep '#pragma x y z' &&
-// RUN: clang %s -E | grep '#pragma a b c'
+// RUN: clang-cc %s -E | grep '#pragma x y z' &&
+// RUN: clang-cc %s -E | grep '#pragma a b c'
_Pragma("x y z")
_Pragma("a b c")
diff --git a/test/Preprocessor/_Pragma-poison.c b/test/Preprocessor/_Pragma-poison.c
index 82a7fbe..742f885 100644
--- a/test/Preprocessor/_Pragma-poison.c
+++ b/test/Preprocessor/_Pragma-poison.c
@@ -1,5 +1,5 @@
-// RUN: clang -Eonly %s 2>&1 | grep error | wc -l | grep 1 &&
-// RUN: clang -Eonly %s 2>&1 | grep 7:4 | wc -l | grep 1
+// RUN: clang-cc -Eonly %s 2>&1 | grep error | wc -l | grep 1 &&
+// RUN: clang-cc -Eonly %s 2>&1 | grep 7:4 | wc -l | grep 1
#define BAR _Pragma ("GCC poison XYZW") XYZW /*NO ERROR*/
XYZW // NO ERROR
diff --git a/test/Preprocessor/_Pragma-syshdr.c b/test/Preprocessor/_Pragma-syshdr.c
index 4d2d29e..44eda5f 100644
--- a/test/Preprocessor/_Pragma-syshdr.c
+++ b/test/Preprocessor/_Pragma-syshdr.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep 'system_header ignored in main file'
+// RUN: clang-cc %s -E 2>&1 | grep 'system_header ignored in main file'
_Pragma ("GCC system_header")
diff --git a/test/Preprocessor/_Pragma-syshdr2.c b/test/Preprocessor/_Pragma-syshdr2.c
index 190e5a7..de7f2d3 100644
--- a/test/Preprocessor/_Pragma-syshdr2.c
+++ b/test/Preprocessor/_Pragma-syshdr2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s 2>&1 | grep 'file not found'
+// RUN: clang-cc -E %s 2>&1 | grep 'file not found'
#define DO_PRAGMA _Pragma
DO_PRAGMA ("GCC dependency \"blahblabh\"")
diff --git a/test/Preprocessor/assembler-with-cpp.c b/test/Preprocessor/assembler-with-cpp.c
index ecb77e5..7a2830b 100644
--- a/test/Preprocessor/assembler-with-cpp.c
+++ b/test/Preprocessor/assembler-with-cpp.c
@@ -1,4 +1,4 @@
-// RUN: clang -x assembler-with-cpp -E %s > %t &&
+// RUN: clang-cc -x assembler-with-cpp -E %s > %t &&
#ifndef __ASSEMBLER__
#error "__ASSEMBLER__ not defined"
diff --git a/test/Preprocessor/builtin_line.c b/test/Preprocessor/builtin_line.c
index 7698d5f..db01e47 100644
--- a/test/Preprocessor/builtin_line.c
+++ b/test/Preprocessor/builtin_line.c
@@ -1,10 +1,10 @@
-// RUN: clang %s -E | grep "^ 4" &&
+// RUN: clang-cc %s -E | grep "^ 4" &&
#define FOO __LINE__
FOO
// PR3579 - This should expand to the __LINE__ of the ')' not of the X.
-// RUN: clang %s -E | grep "^A 13"
+// RUN: clang-cc %s -E | grep "^A 13"
#define X() __LINE__
diff --git a/test/Preprocessor/c99-6_10_3_3_p4.c b/test/Preprocessor/c99-6_10_3_3_p4.c
index 13d5661..8966054 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 -E %s | grep -F 'char p[] = "x ## y";'
+// RUN: clang-cc -E %s | grep -F 'char p[] = "x ## y";'
#define hash_hash # ## #
#define mkstr(a) # a
#define in_between(a) mkstr(a)
diff --git a/test/Preprocessor/c99-6_10_3_4_p5.c b/test/Preprocessor/c99-6_10_3_4_p5.c
index fa5f735..22bdf82 100644
--- a/test/Preprocessor/c99-6_10_3_4_p5.c
+++ b/test/Preprocessor/c99-6_10_3_4_p5.c
@@ -1,9 +1,9 @@
// Example from C99 6.10.3.4p5
-// RUN: clang -E %s | grep -F 'f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);' &&
-// RUN: clang -E %s | grep -F 'f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);' &&
-// RUN: clang -E %s | grep -F 'int i[] = { 1, 23, 4, 5, };' &&
-// RUN: clang -E %s | grep -F 'char c[2][6] = { "hello", "" };'
+// RUN: clang-cc -E %s | grep -F 'f(2 * (y+1)) + f(2 * (f(2 * (z[0])))) % f(2 * (0)) + t(1);' &&
+// RUN: clang-cc -E %s | grep -F 'f(2 * (2 +(3,4)-0,1)) | f(2 * (~ 5)) & f(2 * (0,1))^m(0,1);' &&
+// RUN: clang-cc -E %s | grep -F 'int i[] = { 1, 23, 4, 5, };' &&
+// RUN: clang-cc -E %s | grep -F 'char c[2][6] = { "hello", "" };'
#define x 3
diff --git a/test/Preprocessor/c99-6_10_3_4_p6.c b/test/Preprocessor/c99-6_10_3_4_p6.c
index ce7990a..c48d2ef 100644
--- a/test/Preprocessor/c99-6_10_3_4_p6.c
+++ b/test/Preprocessor/c99-6_10_3_4_p6.c
@@ -1,10 +1,10 @@
// Example from C99 6.10.3.4p6
-// RUN: clang -E %s | grep -F 'printf("x" "1" "= %d, x" "2" "= s" x1, x2);' &&
-// RUN: clang -E %s | grep 'fputs("strncmp(\\"abc\\\\0d\\" \\"abc\\", .\\\\4.) == 0" ": @\\n", s);' &&
-// RUN: clang -E %s | grep -F 'include "vers2.h"' &&
-// RUN: clang -E %s | grep -F '"hello";' &&
-// RUN: clang -E %s | grep -F '"hello" ", world"'
+// RUN: clang-cc -E %s | grep -F 'printf("x" "1" "= %d, x" "2" "= s" x1, x2);' &&
+// RUN: clang-cc -E %s | grep 'fputs("strncmp(\\"abc\\\\0d\\" \\"abc\\", .\\\\4.) == 0" ": @\\n", s);' &&
+// RUN: clang-cc -E %s | grep -F 'include "vers2.h"' &&
+// RUN: clang-cc -E %s | grep -F '"hello";' &&
+// RUN: clang-cc -E %s | grep -F '"hello" ", world"'
#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 88957df..a53df82 100644
--- a/test/Preprocessor/c99-6_10_3_4_p7.c
+++ b/test/Preprocessor/c99-6_10_3_4_p7.c
@@ -1,7 +1,7 @@
// Example from C99 6.10.3.4p7
-// RUN: clang -E %s | grep -F 'int j[] = { 123, 45, 67, 89,' &&
-// RUN: clang -E %s | grep -F '10, 11, 12, };'
+// RUN: clang-cc -E %s | grep -F 'int j[] = { 123, 45, 67, 89,' &&
+// RUN: clang-cc -E %s | grep -F '10, 11, 12, };'
#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 08b4637..39c3454 100644
--- a/test/Preprocessor/c99-6_10_3_4_p9.c
+++ b/test/Preprocessor/c99-6_10_3_4_p9.c
@@ -1,9 +1,9 @@
// Example from C99 6.10.3.4p9
-// RUN: clang -E %s | grep -F 'fprintf(stderr, "Flag");' &&
-// RUN: clang -E %s | grep -F 'fprintf(stderr, "X = %d\n", x);' &&
-// RUN: clang -E %s | grep -F 'puts("The first, second, and third items.");' &&
-// RUN: clang -E %s | grep -F '((x>y)?puts("x>y"): printf("x is %d but y is %d", x, y));'
+// RUN: clang-cc -E %s | grep -F 'fprintf(stderr, "Flag");' &&
+// RUN: clang-cc -E %s | grep -F 'fprintf(stderr, "X = %d\n", x);' &&
+// RUN: clang-cc -E %s | grep -F 'puts("The first, second, and third items.");' &&
+// RUN: clang-cc -E %s | grep -F '((x>y)?puts("x>y"): printf("x is %d but y is %d", x, y));'
#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 4fa6153..1cb3319 100644
--- a/test/Preprocessor/clang_headers.c
+++ b/test/Preprocessor/clang_headers.c
@@ -1,3 +1,3 @@
-// RUN: clang -E %s
+// RUN: clang-cc -E %s
#include <limits.h>
diff --git a/test/Preprocessor/comment_save.c b/test/Preprocessor/comment_save.c
index 1a3bd96..30b0434 100644
--- a/test/Preprocessor/comment_save.c
+++ b/test/Preprocessor/comment_save.c
@@ -1,5 +1,5 @@
-// RUN: clang -E -C %s | grep '^// foo$' &&
-// RUN: clang -E -C %s | grep -F '^/* bar */$'
+// RUN: clang-cc -E -C %s | grep '^// foo$' &&
+// RUN: clang-cc -E -C %s | grep -F '^/* bar */$'
// foo
/* bar */
diff --git a/test/Preprocessor/comment_save_if.c b/test/Preprocessor/comment_save_if.c
index ce7b4c4..c08b2d7 100644
--- a/test/Preprocessor/comment_save_if.c
+++ b/test/Preprocessor/comment_save_if.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E -CC -pedantic 2>&1 | grep -v '^/' | not grep warning
+// RUN: clang-cc %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 635a6fd..66b59d1 100644
--- a/test/Preprocessor/comment_save_macro.c
+++ b/test/Preprocessor/comment_save_macro.c
@@ -1,6 +1,6 @@
-// RUN: clang -E -C %s | grep '^boo bork bar // zot$' &&
-// RUN: clang -E -CC %s | grep -F '^boo bork /* blah*/ bar // zot$' &&
-// RUN: clang -E %s | grep '^boo bork bar$'
+// RUN: clang-cc -E -C %s | grep '^boo bork bar // zot$' &&
+// RUN: clang-cc -E -CC %s | grep -F '^boo bork /* blah*/ bar // zot$' &&
+// RUN: clang-cc -E %s | grep '^boo bork bar$'
#define FOO bork // blah
diff --git a/test/Preprocessor/cxx_and.cpp b/test/Preprocessor/cxx_and.cpp
index b6bd00e..971b7bc 100644
--- a/test/Preprocessor/cxx_and.cpp
+++ b/test/Preprocessor/cxx_and.cpp
@@ -1,7 +1,7 @@
-// RUN: clang -DA -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DB -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// 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'
#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 ecc52e8..8d7fe67 100644
--- a/test/Preprocessor/cxx_bitand.cpp
+++ b/test/Preprocessor/cxx_bitand.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -DB=2 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// 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'
#if A bitand B
#define X 37
#else
diff --git a/test/Preprocessor/cxx_bitor.cpp b/test/Preprocessor/cxx_bitor.cpp
index 36c4452..7645c7e 100644
--- a/test/Preprocessor/cxx_bitor.cpp
+++ b/test/Preprocessor/cxx_bitor.cpp
@@ -1,8 +1,8 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// 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'
#if A bitor B
#define X 37
#else
diff --git a/test/Preprocessor/cxx_compl.cpp b/test/Preprocessor/cxx_compl.cpp
index 12e589f..f1cc6d2 100644
--- a/test/Preprocessor/cxx_compl.cpp
+++ b/test/Preprocessor/cxx_compl.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// 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'
#if compl 0 bitand A
#define X 37
#else
diff --git a/test/Preprocessor/cxx_not.cpp b/test/Preprocessor/cxx_not.cpp
index 2587b0a..dd31901 100644
--- a/test/Preprocessor/cxx_not.cpp
+++ b/test/Preprocessor/cxx_not.cpp
@@ -1,5 +1,5 @@
-// RUN: clang -DA=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 37 == 37'
+// RUN: clang-cc -DA=1 -E %s | grep 'int a = 927 == 927' &&
+// RUN: clang-cc -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 b0be7b3..4940f3b 100644
--- a/test/Preprocessor/cxx_not_eq.cpp
+++ b/test/Preprocessor/cxx_not_eq.cpp
@@ -1,6 +1,6 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=1 -DB=2 -E %s | grep 'int a = 37 == 37'
+// 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'
#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 66586e7..faae687 100644
--- a/test/Preprocessor/cxx_oper_keyword.cpp
+++ b/test/Preprocessor/cxx_oper_keyword.cpp
@@ -1,5 +1,5 @@
-// RUN: not clang %s -E &&
-// RUN: clang %s -E -fno-operator-names
+// RUN: not clang-cc %s -E &&
+// RUN: clang-cc %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 fc8bc70..85f0426 100644
--- a/test/Preprocessor/cxx_oper_spelling.cpp
+++ b/test/Preprocessor/cxx_oper_spelling.cpp
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'a: "and"'
+// RUN: clang-cc -E %s | grep 'a: "and"'
#define X(A) #A
diff --git a/test/Preprocessor/cxx_or.cpp b/test/Preprocessor/cxx_or.cpp
index ce3fed1..133f285 100644
--- a/test/Preprocessor/cxx_or.cpp
+++ b/test/Preprocessor/cxx_or.cpp
@@ -1,7 +1,7 @@
-// RUN: clang -DA -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DB -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// 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'
#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 5ebdaf8..e35c54d 100644
--- a/test/Preprocessor/cxx_true.cpp
+++ b/test/Preprocessor/cxx_true.cpp
@@ -1,6 +1,6 @@
-/* RUN: clang -E %s -x=c++ | grep block_1 &&
- RUN: clang -E %s -x=c++ | not grep block_2 &&
- RUN: clang -E %s -x=c | not grep block
+/* 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
*/
#if true
diff --git a/test/Preprocessor/cxx_xor.cpp b/test/Preprocessor/cxx_xor.cpp
index 7a4c882..a38c3c5 100644
--- a/test/Preprocessor/cxx_xor.cpp
+++ b/test/Preprocessor/cxx_xor.cpp
@@ -1,8 +1,8 @@
-// RUN: clang -DA=1 -DB=1 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -DA=0 -DB=1 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=1 -DB=0 -E %s | grep 'int a = 37 == 37' &&
-// RUN: clang -DA=0 -DB=0 -E %s | grep 'int a = 927 == 927' &&
-// RUN: clang -E %s | grep 'int a = 927 == 927'
+// 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'
#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 df9dc89..eb7632f 100644
--- a/test/Preprocessor/disabled-cond-diags.c
+++ b/test/Preprocessor/disabled-cond-diags.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s 2>&1 | not grep "warning\|error"
+// RUN: clang-cc -E %s 2>&1 | not grep "warning\|error"
#if 0
diff --git a/test/Preprocessor/dump_macros.c b/test/Preprocessor/dump_macros.c
index 348257f..d3e06b2 100644
--- a/test/Preprocessor/dump_macros.c
+++ b/test/Preprocessor/dump_macros.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -dM %s -o %t &&
+// RUN: clang-cc -E -dM %s -o %t &&
// Space even without expansion tokens
// RUN: grep "#define A(x) " %t &&
diff --git a/test/Preprocessor/dumptokens_phyloc.c b/test/Preprocessor/dumptokens_phyloc.c
index ae7ccc7..c0e78c9 100644
--- a/test/Preprocessor/dumptokens_phyloc.c
+++ b/test/Preprocessor/dumptokens_phyloc.c
@@ -1,4 +1,4 @@
-// RUN: clang -dump-tokens %s 2>&1 | grep "Spelling=.*dumptokens_phyloc.c:3:20"
+// RUN: clang-cc -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 e36f040..0a24bac 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 -E %s -std=c89 -pedantic-errors &&
+// RUN: not clang-cc -E %s -std=c89 -pedantic-errors &&
// Comma is allowed if unevaluated in C99
-// RUN: clang -E %s -std=c99 -pedantic-errors
+// RUN: clang-cc -E %s -std=c99 -pedantic-errors
// PR2279
diff --git a/test/Preprocessor/expr_invalid_tok.c b/test/Preprocessor/expr_invalid_tok.c
index 877a845..5e750a4 100644
--- a/test/Preprocessor/expr_invalid_tok.c
+++ b/test/Preprocessor/expr_invalid_tok.c
@@ -1,6 +1,6 @@
-// RUN: not clang -E %s 2>&1 | grep 'invalid token at start of a preprocessor expression' &&
-// RUN: not clang -E %s 2>&1 | grep 'token is not a valid binary operator in a preprocessor subexpression' &&
-// RUN: not clang -E %s 2>&1 | grep ':14: error: expected end of line in preprocessor expression'
+// 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'
// PR2220
#if 1 * * 2
diff --git a/test/Preprocessor/expr_liveness.c b/test/Preprocessor/expr_liveness.c
index d9e5d7c..3d1e25e 100644
--- a/test/Preprocessor/expr_liveness.c
+++ b/test/Preprocessor/expr_liveness.c
@@ -1,5 +1,5 @@
-/* RUN: clang -E %s -DNO_ERRORS -Werror -Wundef &&
- RUN: not clang -E %s
+/* RUN: clang-cc -E %s -DNO_ERRORS -Werror -Wundef &&
+ RUN: not clang-cc -E %s
*/
#ifdef NO_ERRORS
diff --git a/test/Preprocessor/expr_usual_conversions.c b/test/Preprocessor/expr_usual_conversions.c
index 90275c9..47aca7b 100644
--- a/test/Preprocessor/expr_usual_conversions.c
+++ b/test/Preprocessor/expr_usual_conversions.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep warning | wc -l | grep 2
+// RUN: clang-cc %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 c325c2f..00c9b87 100644
--- a/test/Preprocessor/extension-warning.c
+++ b/test/Preprocessor/extension-warning.c
@@ -1,4 +1,4 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s
+// RUN: clang-cc -fsyntax-only -verify -pedantic %s
// The preprocessor shouldn't warn about extensions within macro bodies that
// aren't expanded.
diff --git a/test/Preprocessor/function_macro_file.c b/test/Preprocessor/function_macro_file.c
index eeb9256..6a266dd 100644
--- a/test/Preprocessor/function_macro_file.c
+++ b/test/Preprocessor/function_macro_file.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E -P %s | grep f
+/* RUN: clang-cc -E -P %s | grep f
*/
#include "function_macro_file.h"
diff --git a/test/Preprocessor/hash_line.c b/test/Preprocessor/hash_line.c
index 788440b..7ed65d1 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 %s -E | not grep "1 #" &&
-// RUN: clang %s -E | grep '^1$' &&
-// RUN: clang %s -E | grep '^ #$'
+// RUN: clang-cc %s -E | not grep "1 #" &&
+// RUN: clang-cc %s -E | grep '^1$' &&
+// RUN: clang-cc %s -E | grep '^ #$'
1
#define EMPTY
EMPTY #
diff --git a/test/Preprocessor/hash_space.c b/test/Preprocessor/hash_space.c
index 77f5cfc..e7dbd3b 100644
--- a/test/Preprocessor/hash_space.c
+++ b/test/Preprocessor/hash_space.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep " #"
+// RUN: clang-cc %s -E | grep " #"
// Should put a space before the # so that -fpreprocessed mode doesn't
// macro expand this again.
diff --git a/test/Preprocessor/header_lookup1.c b/test/Preprocessor/header_lookup1.c
index 10049ad..df58a6e 100644
--- a/test/Preprocessor/header_lookup1.c
+++ b/test/Preprocessor/header_lookup1.c
@@ -1,2 +1,2 @@
-// RUN: clang -I /usr/include %s -E | grep 'stdio.h.*3.*4'
+// RUN: clang-cc -I /usr/include %s -E | grep 'stdio.h.*3.*4'
#include <stdio.h>
diff --git a/test/Preprocessor/if_warning.c b/test/Preprocessor/if_warning.c
index bf30d30..f07c887 100644
--- a/test/Preprocessor/if_warning.c
+++ b/test/Preprocessor/if_warning.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E -Wundef -Werror 2>&1 | grep error | count 1 &&
-// RUN: clang %s -E -Werror 2>&1 | not grep error
+// RUN: clang-cc %s -E -Wundef -Werror 2>&1 | grep error | count 1 &&
+// RUN: clang-cc %s -E -Werror 2>&1 | not grep error
#if foo // Should generate an warning
#endif
diff --git a/test/Preprocessor/ifdef-recover.c b/test/Preprocessor/ifdef-recover.c
index 7fad8c2..3fffcc0 100644
--- a/test/Preprocessor/ifdef-recover.c
+++ b/test/Preprocessor/ifdef-recover.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E %s 2>&1 >/dev/null | grep error: | count 3
+/* RUN: clang-cc -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 e8f6fa7..2cabe3d 100644
--- a/test/Preprocessor/import_self.c
+++ b/test/Preprocessor/import_self.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -I. %s | grep BODY_OF_FILE | wc -l | grep 1
+// RUN: clang-cc -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 3e449c5..66f70fb 100644
--- a/test/Preprocessor/include-directive1.c
+++ b/test/Preprocessor/include-directive1.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 3
+// RUN: clang-cc -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 8309b45..785b77c 100644
--- a/test/Preprocessor/include-directive2.c
+++ b/test/Preprocessor/include-directive2.c
@@ -1,4 +1,4 @@
-// RUN: clang -Eonly %s
+// RUN: clang-cc -Eonly %s
# define HEADER <float.h>
# include HEADER
diff --git a/test/Preprocessor/include-directive3.c b/test/Preprocessor/include-directive3.c
index 9e22d5d..2541301 100644
--- a/test/Preprocessor/include-directive3.c
+++ b/test/Preprocessor/include-directive3.c
@@ -1,3 +1,3 @@
-// RUN: clang -include file_to_include.h -E %s -fno-caret-diagnostics 2>&1 >/dev/null | grep 'file successfully included' | count 1
+// RUN: clang-cc -include 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-pth.c b/test/Preprocessor/include-pth.c
index 64b46eb..2bdc7dc 100644
--- a/test/Preprocessor/include-pth.c
+++ b/test/Preprocessor/include-pth.c
@@ -1,2 +1,3 @@
-// RUN: clang -x c-header %s -o %t && clang -include-pth %t %s -E | grep 'file_to_include' | count 2
+// RUN: clang-cc -x c-header %s -o %t &&
+// RUN: clang-cc -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 0dcaa7b..f6b411e 100644
--- a/test/Preprocessor/indent_macro.c
+++ b/test/Preprocessor/indent_macro.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^ zzap$'
+// RUN: clang-cc -E %s | grep '^ zzap$'
// zzap is on a new line, should be indented.
#define BLAH zzap
diff --git a/test/Preprocessor/line-directive.c b/test/Preprocessor/line-directive.c
index a1590fa..07cfa65 100644
--- a/test/Preprocessor/line-directive.c
+++ b/test/Preprocessor/line-directive.c
@@ -1,6 +1,6 @@
-// RUN: clang -fsyntax-only -verify -pedantic %s &&
-// RUN: clang -E %s 2>&1 | grep 'blonk.c:92:2: error: #error ABC' &&
-// RUN: clang -E %s 2>&1 | grep 'blonk.c:93:2: error: #error DEF'
+// 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'
#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 1f9d7e7..92b1ae5 100644
--- a/test/Preprocessor/macro_arg_keyword.c
+++ b/test/Preprocessor/macro_arg_keyword.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep xxx-xxx
+// RUN: clang-cc -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 33b856d..ff861d2 100644
--- a/test/Preprocessor/macro_disable.c
+++ b/test/Preprocessor/macro_disable.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep 'a: 2 + M_0(3)(4)(5);' &&
-// RUN: clang -E %s | grep 'b: 4 + 4 + 3 + 2 + 1 + M_0(3)(2)(1);'
+// 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);'
#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 6e1f804..286539e 100644
--- a/test/Preprocessor/macro_disable2.c
+++ b/test/Preprocessor/macro_disable2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'A B C A B A C A B C A'
+// RUN: clang-cc -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 b358a55..011de3b 100644
--- a/test/Preprocessor/macro_disable3.c
+++ b/test/Preprocessor/macro_disable3.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep -F 'f(2 * (f(2 * (z[0]))));'
+// RUN: clang-cc %s -E | grep -F 'f(2 * (f(2 * (z[0]))));'
// 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 4858813..b652b98 100644
--- a/test/Preprocessor/macro_disable4.c
+++ b/test/Preprocessor/macro_disable4.c
@@ -1,4 +1,4 @@
-// RUN: clang -P -E %s | grep 'int f(void)'
+// RUN: clang-cc -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 69a4835..a7a80af 100644
--- a/test/Preprocessor/macro_expand.c
+++ b/test/Preprocessor/macro_expand.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^Y$'
+// RUN: clang-cc -E %s | grep '^Y$'
#define X() Y
#define Y() X
diff --git a/test/Preprocessor/macro_expandloc.c b/test/Preprocessor/macro_expandloc.c
index 00bba6f..ce1efd2 100644
--- a/test/Preprocessor/macro_expandloc.c
+++ b/test/Preprocessor/macro_expandloc.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep '#include'
+// RUN: clang-cc %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 3a83329..9adf3fd 100644
--- a/test/Preprocessor/macro_expandloc2.c
+++ b/test/Preprocessor/macro_expandloc2.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep '#include'
+// RUN: clang-cc %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_comma_swallow.c b/test/Preprocessor/macro_fn_comma_swallow.c
index d4f3bb9..4e06f89 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 %s -E | grep 'foo{A, }' &&
-// RUN: clang %s -E | grep 'fo2{A,}' &&
-// RUN: clang %s -E | grep '{foo}'
+// RUN: clang-cc %s -E | grep 'foo{A, }' &&
+// RUN: clang-cc %s -E | grep 'fo2{A,}' &&
+// RUN: clang-cc %s -E | grep '{foo}'
#define X(Y) foo{A, Y}
X()
diff --git a/test/Preprocessor/macro_fn_disable_expand.c b/test/Preprocessor/macro_fn_disable_expand.c
index a9e1d46..d99c018 100644
--- a/test/Preprocessor/macro_fn_disable_expand.c
+++ b/test/Preprocessor/macro_fn_disable_expand.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'bar foo (2)' &&
-// RUN: clang %s -E | grep 'm(ABCD)'
+// RUN: clang-cc %s -E | grep 'bar foo (2)' &&
+// RUN: clang-cc %s -E | grep 'm(ABCD)'
#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 497ef23..1056fd8 100644
--- a/test/Preprocessor/macro_fn_lparen_scan.c
+++ b/test/Preprocessor/macro_fn_lparen_scan.c
@@ -1,7 +1,7 @@
-// RUN: clang -E %s | grep 'noexp: foo y' &&
-// RUN: clang -E %s | grep 'expand: abc' &&
-// RUN: clang -E %s | grep 'noexp2: foo nonexp' &&
-// RUN: clang -E %s | grep 'expand2: abc'
+// 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'
#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 fa4d504..fb64bef 100644
--- a/test/Preprocessor/macro_fn_lparen_scan2.c
+++ b/test/Preprocessor/macro_fn_lparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep 'FUNC (3 +1);'
+// RUN: clang-cc -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 30c0bcf..ff688ce 100644
--- a/test/Preprocessor/macro_fn_placemarker.c
+++ b/test/Preprocessor/macro_fn_placemarker.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep 'foo(A, )'
+// RUN: clang-cc %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 81a7c41..a392263 100644
--- a/test/Preprocessor/macro_fn_preexpand.c
+++ b/test/Preprocessor/macro_fn_preexpand.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'pre: 1 1 X' &&
-// RUN: clang %s -E | grep 'nopre: 1A(X)'
+// RUN: clang-cc %s -E | grep 'pre: 1 1 X' &&
+// RUN: clang-cc %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 716e920..78ad212 100644
--- a/test/Preprocessor/macro_fn_varargs_iso.c
+++ b/test/Preprocessor/macro_fn_varargs_iso.c
@@ -1,7 +1,7 @@
-// RUN: clang -E %s | grep 'foo{a, b, c, d, e}' &&
-// RUN: clang -E %s | grep 'foo2{d, C, B}' &&
-// RUN: clang -E %s | grep 'foo2{d,e, C, B}'
+// 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}'
#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 b3bb72c..c2841b1 100644
--- a/test/Preprocessor/macro_fn_varargs_named.c
+++ b/test/Preprocessor/macro_fn_varargs_named.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '^a: x$' &&
-// RUN: clang -E %s | grep '^b: x y, z,h$' &&
-// RUN: clang -E %s | grep '^c: foo(x)$'
+// 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)$'
#define A(b, c...) b c
a: A(x)
diff --git a/test/Preprocessor/macro_misc.c b/test/Preprocessor/macro_misc.c
index 147e827..169c5ec 100644
--- a/test/Preprocessor/macro_misc.c
+++ b/test/Preprocessor/macro_misc.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -Eonly -verify
+// RUN: clang-cc %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 388481a..a42240b 100644
--- a/test/Preprocessor/macro_not_define.c
+++ b/test/Preprocessor/macro_not_define.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^ # define X 3$'
+// RUN: clang-cc -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 60caa42..1ccfdec 100644
--- a/test/Preprocessor/macro_paste_bad.c
+++ b/test/Preprocessor/macro_paste_bad.c
@@ -1,4 +1,4 @@
-// RUN: clang -Eonly %s 2>&1 | grep error
+// RUN: clang-cc -Eonly %s 2>&1 | grep error
// pasting ""x"" and ""+"" does not give a valid preprocessing token
#define XYZ x ## +
XYZ
diff --git a/test/Preprocessor/macro_paste_bcpl_comment.c b/test/Preprocessor/macro_paste_bcpl_comment.c
index 9a864d5..8bbee5d 100644
--- a/test/Preprocessor/macro_paste_bcpl_comment.c
+++ b/test/Preprocessor/macro_paste_bcpl_comment.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -Eonly 2>&1 | grep error
+// RUN: clang-cc %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 9299514..86f8124 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 %s -Eonly 2>&1 | grep error &&
-// RUN: clang %s -Eonly 2>&1 | not grep unterminated &&
-// RUN: clang %s -Eonly 2>&1 | not grep scratch
+// 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
#define COMM / ## *
COMM
diff --git a/test/Preprocessor/macro_paste_commaext.c b/test/Preprocessor/macro_paste_commaext.c
index e75ac1f..e98849b 100644
--- a/test/Preprocessor/macro_paste_commaext.c
+++ b/test/Preprocessor/macro_paste_commaext.c
@@ -1,8 +1,8 @@
-// RUN: clang %s -E | grep 'V);' &&
-// RUN: clang %s -E | grep 'W, 1, 2);' &&
-// RUN: clang %s -E | grep 'X, 1, 2);' &&
-// RUN: clang %s -E | grep 'Y, );' &&
-// RUN: clang %s -E | grep 'Z, );'
+// 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, );'
#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 8b78ecd..75504bc 100644
--- a/test/Preprocessor/macro_paste_empty.c
+++ b/test/Preprocessor/macro_paste_empty.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep 'a:Y' &&
-// RUN: clang -E %s | grep 'b:Y' &&
-// RUN: clang -E %s | grep 'c:YY'
+// RUN: clang-cc -E %s | grep 'a:Y' &&
+// RUN: clang-cc -E %s | grep 'b:Y' &&
+// RUN: clang-cc -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 be46745..25b6c19 100644
--- a/test/Preprocessor/macro_paste_hard.c
+++ b/test/Preprocessor/macro_paste_hard.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '1: aaab 2' &&
-// RUN: clang -E %s | grep '2: 2 baaa' &&
-// RUN: clang -E %s | grep '3: 2 xx'
+// 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'
#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 4ebf55e..42654fd 100644
--- a/test/Preprocessor/macro_paste_hashhash.c
+++ b/test/Preprocessor/macro_paste_hashhash.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^"x ## y";$'
+// RUN: clang-cc -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 858337a..b0fc571 100644
--- a/test/Preprocessor/macro_paste_mscomment.c
+++ b/test/Preprocessor/macro_paste_mscomment.c
@@ -1,4 +1,4 @@
-// RUN: clang -P -E -fms-extensions %s | sed '/^#.\+/d' | tr -d '\n' |
+// RUN: clang-cc -P -E -fms-extensions %s | sed '/^#.\+/d' | tr -d '\n' |
// RUN: grep '^int foo;int bar;int baz;$' | count 1
// This horrible stuff should preprocess into (other than whitespace):
// int foo;
diff --git a/test/Preprocessor/macro_paste_none.c b/test/Preprocessor/macro_paste_none.c
index 2ba2820..e978fca 100644
--- a/test/Preprocessor/macro_paste_none.c
+++ b/test/Preprocessor/macro_paste_none.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '!!'
+// RUN: clang-cc -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 82b75da..2affbac 100644
--- a/test/Preprocessor/macro_paste_simple.c
+++ b/test/Preprocessor/macro_paste_simple.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep "barbaz123"
+// RUN: clang-cc %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 471ebcc..130548d 100644
--- a/test/Preprocessor/macro_paste_spacing.c
+++ b/test/Preprocessor/macro_paste_spacing.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep "^xy$"
+// RUN: clang-cc %s -E | grep "^xy$"
#define A x ## y
blah
diff --git a/test/Preprocessor/macro_rescan.c b/test/Preprocessor/macro_rescan.c
index 2ceb292..17b4dc2 100644
--- a/test/Preprocessor/macro_rescan.c
+++ b/test/Preprocessor/macro_rescan.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep 'ei_1 = (17 +1);' &&
-// RUN: clang -E %s | grep 'ei_2 = (M1)(17);'
+// RUN: clang-cc -E %s | grep 'ei_1 = (17 +1);' &&
+// RUN: clang-cc -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 4fae444..6914ae0 100644
--- a/test/Preprocessor/macro_rescan2.c
+++ b/test/Preprocessor/macro_rescan2.c
@@ -1,5 +1,5 @@
-// RUN: clang %s -E | grep 'a: 2\*f(9)' &&
-// RUN: clang %s -E | grep 'b: 2\*9\*g'
+// RUN: clang-cc %s -E | grep 'a: 2\*f(9)' &&
+// RUN: clang-cc %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 3c79d0e..ed1056a 100644
--- a/test/Preprocessor/macro_rescan_varargs.c
+++ b/test/Preprocessor/macro_rescan_varargs.c
@@ -1,5 +1,5 @@
-// RUN: clang -E %s | grep -F "1: F, (, 'a', 'b', );" &&
-// RUN: clang -E %s | grep -F "2: 'a' + 'b';"
+// RUN: clang-cc -E %s | grep -F "1: F, (, 'a', 'b', );" &&
+// RUN: clang-cc -E %s | grep -F "2: 'a' + 'b';"
#define LPAREN (
#define RPAREN )
#define F(x, y) x + y
diff --git a/test/Preprocessor/macro_rparen_scan.c b/test/Preprocessor/macro_rparen_scan.c
index d4e6283..9275098 100644
--- a/test/Preprocessor/macro_rparen_scan.c
+++ b/test/Preprocessor/macro_rparen_scan.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '^3 ;$'
+// RUN: clang-cc -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 a9ca9d1..41748ac 100644
--- a/test/Preprocessor/macro_rparen_scan2.c
+++ b/test/Preprocessor/macro_rparen_scan2.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep -F 'static int glob = (1 + 1 );'
+// RUN: clang-cc -E %s | grep -F 'static int glob = (1 + 1 );'
#define R_PAREN )
diff --git a/test/Preprocessor/macro_space.c b/test/Preprocessor/macro_space.c
index 553fddb..4fdbb0a 100644
--- a/test/Preprocessor/macro_space.c
+++ b/test/Preprocessor/macro_space.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E | grep '! ,'
+// RUN: clang-cc %s -E | grep '! ,'
#define XX
! XX,
diff --git a/test/Preprocessor/mi_opt.c b/test/Preprocessor/mi_opt.c
index 96029dc..aa69e2b 100644
--- a/test/Preprocessor/mi_opt.c
+++ b/test/Preprocessor/mi_opt.c
@@ -1,4 +1,4 @@
-// RUN: not clang -fsyntax-only %s
+// RUN: not clang-cc -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/objc-pp.m b/test/Preprocessor/objc-pp.m
index 0648acd..866e7e4 100644
--- a/test/Preprocessor/objc-pp.m
+++ b/test/Preprocessor/objc-pp.m
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -pedantic
+// RUN: clang-cc %s -fsyntax-only -verify -pedantic
#import <stdio.h> // no warning.
diff --git a/test/Preprocessor/output_paste_avoid.c b/test/Preprocessor/output_paste_avoid.c
index 7fe8788..b23d22a 100644
--- a/test/Preprocessor/output_paste_avoid.c
+++ b/test/Preprocessor/output_paste_avoid.c
@@ -1,6 +1,6 @@
-// RUN: clang -E %s | grep '+ + - - + + = = =' &&
-// RUN: clang -E %s | not grep -F '...' &&
-// RUN: clang -E %s | not grep -F 'L"str"'
+// RUN: clang-cc -E %s | grep '+ + - - + + = = =' &&
+// RUN: clang-cc -E %s | not grep -F '...' &&
+// RUN: clang-cc -E %s | not grep -F 'L"str"'
// This should print as ".. ." to avoid turning into ...
#define y(a) ..a
diff --git a/test/Preprocessor/paste_bad.c b/test/Preprocessor/paste_bad.c
index 89e8799..de2417f 100644
--- a/test/Preprocessor/paste_bad.c
+++ b/test/Preprocessor/paste_bad.c
@@ -1,6 +1,6 @@
// GCC PR 20077
-// RUN: not clang -E %s &&
-// RUN: not clang -E %s 2>&1 | grep error: | wc -l | grep 10
+// RUN: not clang-cc -E %s &&
+// RUN: not clang-cc -E %s 2>&1 | grep error: | wc -l | grep 10
#define a a ## ## /* { dg-error "end of a macro expansion" } */
#define b() b ## ## /* { dg-error "end of a macro expansion" } */
diff --git a/test/Preprocessor/poison.c b/test/Preprocessor/poison.c
index 5df4b47..9759ae4 100644
--- a/test/Preprocessor/poison.c
+++ b/test/Preprocessor/poison.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | grep error
+// RUN: clang-cc %s -E 2>&1 | grep error
#pragma GCC poison rindex
rindex(some_string, 'h');
diff --git a/test/Preprocessor/poison_expansion.c b/test/Preprocessor/poison_expansion.c
index 3444bac..45676c8 100644
--- a/test/Preprocessor/poison_expansion.c
+++ b/test/Preprocessor/poison_expansion.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -E 2>&1 | not grep error
+// RUN: clang-cc %s -E 2>&1 | not grep error
#define strrchr rindex
#pragma GCC poison rindex
diff --git a/test/Preprocessor/pr2086.c b/test/Preprocessor/pr2086.c
index ddf2c16..4df65a4 100644
--- a/test/Preprocessor/pr2086.c
+++ b/test/Preprocessor/pr2086.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s
+// RUN: clang-cc -E %s
#define test
#include "pr2086.h"
diff --git a/test/Preprocessor/pragma_microsoft.c b/test/Preprocessor/pragma_microsoft.c
index e05126d..81e90e3 100644
--- a/test/Preprocessor/pragma_microsoft.c
+++ b/test/Preprocessor/pragma_microsoft.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -fsyntax-only -verify -fms-extensions
+// RUN: clang-cc %s -fsyntax-only -verify -fms-extensions
// rdar://6495941
diff --git a/test/Preprocessor/pragma_unknown.c b/test/Preprocessor/pragma_unknown.c
index ca2bea1..e1b040b 100644
--- a/test/Preprocessor/pragma_unknown.c
+++ b/test/Preprocessor/pragma_unknown.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep '#pragma foo bar'
+// RUN: clang-cc -E %s | grep '#pragma foo bar'
// 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 505e5f9..539433d 100644
--- a/test/Preprocessor/print_line_track.c
+++ b/test/Preprocessor/print_line_track.c
@@ -1,8 +1,8 @@
-/* RUN: clang -E %s | grep 'a 3' &&
- * RUN: clang -E %s | grep 'b 16' &&
- * RUN: clang -E -P %s | grep 'a 3' &&
- * RUN: clang -E -P %s | grep 'b 16' &&
- * RUN: clang -E %s | not grep '# 0 '
+/* 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 '
* PR1848
* PR3437
*/
diff --git a/test/Preprocessor/skipping_unclean.c b/test/Preprocessor/skipping_unclean.c
index 9efdd64..31ce9b4 100644
--- a/test/Preprocessor/skipping_unclean.c
+++ b/test/Preprocessor/skipping_unclean.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep bark
+// RUN: clang-cc -E %s | grep bark
#if 0
blah
diff --git a/test/Preprocessor/stringize_misc.c b/test/Preprocessor/stringize_misc.c
index b8e4480..251116a 100644
--- a/test/Preprocessor/stringize_misc.c
+++ b/test/Preprocessor/stringize_misc.c
@@ -1,9 +1,9 @@
-// RUN: clang -E %s | grep -F '"f(1, 2)" "g((x=y++, y))"' &&
-// RUN: clang -E %s | grep -F '"{a=1" "b=2;}"' &&
-// RUN: clang -E %s | grep -F '"<" "["' &&
-// RUN: clang -E %s | grep -F '"(,)" "(...)"' &&
-// RUN: clang -E %s | grep -F '{a=1 c=3; b=2;}' &&
-// RUN: clang -E %s | grep -F '"a COMMA b" "(a, b)"'
+// RUN: clang-cc -E %s | grep -F '"f(1, 2)" "g((x=y++, y))"' &&
+// RUN: clang-cc -E %s | grep -F '"{a=1" "b=2;}"' &&
+// RUN: clang-cc -E %s | grep -F '"<" "["' &&
+// RUN: clang-cc -E %s | grep -F '"(,)" "(...)"' &&
+// RUN: clang-cc -E %s | grep -F '{a=1 c=3; b=2;}' &&
+// RUN: clang-cc -E %s | grep -F '"a COMMA b" "(a, b)"'
#define M(x, y) #x #y
diff --git a/test/Preprocessor/stringize_space.c b/test/Preprocessor/stringize_space.c
index 8c83677..e41736c 100644
--- a/test/Preprocessor/stringize_space.c
+++ b/test/Preprocessor/stringize_space.c
@@ -1,4 +1,4 @@
-// RUN: clang -E %s | grep -- '-"" , - "" , -"" , - ""'
+// RUN: clang-cc -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 cf81674..6a96894 100644
--- a/test/Preprocessor/stringize_space2.c
+++ b/test/Preprocessor/stringize_space2.c
@@ -1,4 +1,4 @@
-/* RUN: clang -E %s | grep 'a c'
+/* RUN: clang-cc -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 a276934..f818e59 100644
--- a/test/Preprocessor/undef-error.c
+++ b/test/Preprocessor/undef-error.c
@@ -1,4 +1,4 @@
-// RUN: clang %s -pedantic-errors -verify
+// RUN: clang-cc %s -pedantic-errors -verify
// PR2045
#define b
diff --git a/test/Preprocessor/unterminated.c b/test/Preprocessor/unterminated.c
index 59bcae8..2040aac 100644
--- a/test/Preprocessor/unterminated.c
+++ b/test/Preprocessor/unterminated.c
@@ -1,4 +1,4 @@
-// RUN: clang -E -verify %s
+// RUN: clang-cc -E -verify %s
// PR3096
#ifdef FOO // expected-error {{unterminated conditional directive}}
/* /* */