diff options
Diffstat (limited to 'clang/test/Preprocessor')
100 files changed, 189 insertions, 188 deletions
diff --git a/clang/test/Preprocessor/_Pragma-dependency.c b/clang/test/Preprocessor/_Pragma-dependency.c index 837f31d07c9..da1d87f741e 100644 --- a/clang/test/Preprocessor/_Pragma-dependency.c +++ b/clang/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/clang/test/Preprocessor/_Pragma-location.c b/clang/test/Preprocessor/_Pragma-location.c index 152e71ac13b..61cadfbb8a1 100644 --- a/clang/test/Preprocessor/_Pragma-location.c +++ b/clang/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/clang/test/Preprocessor/_Pragma-physloc.c b/clang/test/Preprocessor/_Pragma-physloc.c index b8f5499c7a1..87379491676 100644 --- a/clang/test/Preprocessor/_Pragma-physloc.c +++ b/clang/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/clang/test/Preprocessor/_Pragma-poison.c b/clang/test/Preprocessor/_Pragma-poison.c index 82a7fbecc2e..742f88532ee 100644 --- a/clang/test/Preprocessor/_Pragma-poison.c +++ b/clang/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/clang/test/Preprocessor/_Pragma-syshdr.c b/clang/test/Preprocessor/_Pragma-syshdr.c index 4d2d29e023a..44eda5f0b96 100644 --- a/clang/test/Preprocessor/_Pragma-syshdr.c +++ b/clang/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/clang/test/Preprocessor/_Pragma-syshdr2.c b/clang/test/Preprocessor/_Pragma-syshdr2.c index 190e5a7a307..de7f2d3dc3b 100644 --- a/clang/test/Preprocessor/_Pragma-syshdr2.c +++ b/clang/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/clang/test/Preprocessor/assembler-with-cpp.c b/clang/test/Preprocessor/assembler-with-cpp.c index ecb77e5f964..7a2830b3240 100644 --- a/clang/test/Preprocessor/assembler-with-cpp.c +++ b/clang/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/clang/test/Preprocessor/builtin_line.c b/clang/test/Preprocessor/builtin_line.c index 7698d5f43c4..db01e47995a 100644 --- a/clang/test/Preprocessor/builtin_line.c +++ b/clang/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/clang/test/Preprocessor/c99-6_10_3_3_p4.c b/clang/test/Preprocessor/c99-6_10_3_3_p4.c index 13d5661e360..89660549b9a 100644 --- a/clang/test/Preprocessor/c99-6_10_3_3_p4.c +++ b/clang/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/clang/test/Preprocessor/c99-6_10_3_4_p5.c b/clang/test/Preprocessor/c99-6_10_3_4_p5.c index fa5f7358b9e..22bdf8258cb 100644 --- a/clang/test/Preprocessor/c99-6_10_3_4_p5.c +++ b/clang/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/clang/test/Preprocessor/c99-6_10_3_4_p6.c b/clang/test/Preprocessor/c99-6_10_3_4_p6.c index ce7990a4cf3..c48d2efd2ef 100644 --- a/clang/test/Preprocessor/c99-6_10_3_4_p6.c +++ b/clang/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/clang/test/Preprocessor/c99-6_10_3_4_p7.c b/clang/test/Preprocessor/c99-6_10_3_4_p7.c index 88957dfb675..a53df8263f1 100644 --- a/clang/test/Preprocessor/c99-6_10_3_4_p7.c +++ b/clang/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/clang/test/Preprocessor/c99-6_10_3_4_p9.c b/clang/test/Preprocessor/c99-6_10_3_4_p9.c index 08b4637e0e3..39c34546ad4 100644 --- a/clang/test/Preprocessor/c99-6_10_3_4_p9.c +++ b/clang/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/clang/test/Preprocessor/clang_headers.c b/clang/test/Preprocessor/clang_headers.c index 4fa6153459f..1cb331998f4 100644 --- a/clang/test/Preprocessor/clang_headers.c +++ b/clang/test/Preprocessor/clang_headers.c @@ -1,3 +1,3 @@ -// RUN: clang -E %s +// RUN: clang-cc -E %s #include <limits.h> diff --git a/clang/test/Preprocessor/comment_save.c b/clang/test/Preprocessor/comment_save.c index 1a3bd96efb5..30b043433c9 100644 --- a/clang/test/Preprocessor/comment_save.c +++ b/clang/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/clang/test/Preprocessor/comment_save_if.c b/clang/test/Preprocessor/comment_save_if.c index ce7b4c45b10..c08b2d7c78b 100644 --- a/clang/test/Preprocessor/comment_save_if.c +++ b/clang/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/clang/test/Preprocessor/comment_save_macro.c b/clang/test/Preprocessor/comment_save_macro.c index 635a6fd4064..66b59d136d7 100644 --- a/clang/test/Preprocessor/comment_save_macro.c +++ b/clang/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/clang/test/Preprocessor/cxx_and.cpp b/clang/test/Preprocessor/cxx_and.cpp index b6bd00e5293..971b7bc991d 100644 --- a/clang/test/Preprocessor/cxx_and.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_bitand.cpp b/clang/test/Preprocessor/cxx_bitand.cpp index ecc52e89ab5..8d7fe678e3e 100644 --- a/clang/test/Preprocessor/cxx_bitand.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_bitor.cpp b/clang/test/Preprocessor/cxx_bitor.cpp index 36c44523df3..7645c7ee513 100644 --- a/clang/test/Preprocessor/cxx_bitor.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_compl.cpp b/clang/test/Preprocessor/cxx_compl.cpp index 12e589ffa1e..f1cc6d2800d 100644 --- a/clang/test/Preprocessor/cxx_compl.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_not.cpp b/clang/test/Preprocessor/cxx_not.cpp index 2587b0ab994..dd3190117d9 100644 --- a/clang/test/Preprocessor/cxx_not.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_not_eq.cpp b/clang/test/Preprocessor/cxx_not_eq.cpp index b0be7b39173..4940f3b0a7b 100644 --- a/clang/test/Preprocessor/cxx_not_eq.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_oper_keyword.cpp b/clang/test/Preprocessor/cxx_oper_keyword.cpp index 66586e7b36c..faae68741ee 100644 --- a/clang/test/Preprocessor/cxx_oper_keyword.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_oper_spelling.cpp b/clang/test/Preprocessor/cxx_oper_spelling.cpp index fc8bc70e519..85f0426ca3a 100644 --- a/clang/test/Preprocessor/cxx_oper_spelling.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_or.cpp b/clang/test/Preprocessor/cxx_or.cpp index ce3fed1cd48..133f28516b4 100644 --- a/clang/test/Preprocessor/cxx_or.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_true.cpp b/clang/test/Preprocessor/cxx_true.cpp index 5ebdaf8d2fe..e35c54d7b3f 100644 --- a/clang/test/Preprocessor/cxx_true.cpp +++ b/clang/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/clang/test/Preprocessor/cxx_xor.cpp b/clang/test/Preprocessor/cxx_xor.cpp index 7a4c8822cda..a38c3c5454b 100644 --- a/clang/test/Preprocessor/cxx_xor.cpp +++ b/clang/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/clang/test/Preprocessor/disabled-cond-diags.c b/clang/test/Preprocessor/disabled-cond-diags.c index df9dc8919b1..eb7632f29b3 100644 --- a/clang/test/Preprocessor/disabled-cond-diags.c +++ b/clang/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/clang/test/Preprocessor/dump_macros.c b/clang/test/Preprocessor/dump_macros.c index 348257fb519..d3e06b2bfac 100644 --- a/clang/test/Preprocessor/dump_macros.c +++ b/clang/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/clang/test/Preprocessor/dumptokens_phyloc.c b/clang/test/Preprocessor/dumptokens_phyloc.c index ae7ccc7d210..c0e78c9b155 100644 --- a/clang/test/Preprocessor/dumptokens_phyloc.c +++ b/clang/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/clang/test/Preprocessor/expr_comma.c b/clang/test/Preprocessor/expr_comma.c index e36f0407bf8..0a24baca46c 100644 --- a/clang/test/Preprocessor/expr_comma.c +++ b/clang/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/clang/test/Preprocessor/expr_invalid_tok.c b/clang/test/Preprocessor/expr_invalid_tok.c index 877a845eff6..5e750a462be 100644 --- a/clang/test/Preprocessor/expr_invalid_tok.c +++ b/clang/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/clang/test/Preprocessor/expr_liveness.c b/clang/test/Preprocessor/expr_liveness.c index d9e5d7cb25f..3d1e25edd4e 100644 --- a/clang/test/Preprocessor/expr_liveness.c +++ b/clang/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/clang/test/Preprocessor/expr_usual_conversions.c b/clang/test/Preprocessor/expr_usual_conversions.c index 90275c99444..47aca7beca6 100644 --- a/clang/test/Preprocessor/expr_usual_conversions.c +++ b/clang/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/clang/test/Preprocessor/extension-warning.c b/clang/test/Preprocessor/extension-warning.c index c325c2fcf23..00c9b8735f3 100644 --- a/clang/test/Preprocessor/extension-warning.c +++ b/clang/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/clang/test/Preprocessor/function_macro_file.c b/clang/test/Preprocessor/function_macro_file.c index eeb9256ec73..6a266dd0790 100644 --- a/clang/test/Preprocessor/function_macro_file.c +++ b/clang/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/clang/test/Preprocessor/hash_line.c b/clang/test/Preprocessor/hash_line.c index 788440ba82a..7ed65d1b424 100644 --- a/clang/test/Preprocessor/hash_line.c +++ b/clang/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/clang/test/Preprocessor/hash_space.c b/clang/test/Preprocessor/hash_space.c index 77f5cfc5306..e7dbd3bc617 100644 --- a/clang/test/Preprocessor/hash_space.c +++ b/clang/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/clang/test/Preprocessor/header_lookup1.c b/clang/test/Preprocessor/header_lookup1.c index 10049adcd37..df58a6ea9c5 100644 --- a/clang/test/Preprocessor/header_lookup1.c +++ b/clang/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/clang/test/Preprocessor/if_warning.c b/clang/test/Preprocessor/if_warning.c index bf30d303b66..f07c88707e7 100644 --- a/clang/test/Preprocessor/if_warning.c +++ b/clang/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/clang/test/Preprocessor/ifdef-recover.c b/clang/test/Preprocessor/ifdef-recover.c index 7fad8c20bd4..3fffcc0290d 100644 --- a/clang/test/Preprocessor/ifdef-recover.c +++ b/clang/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/clang/test/Preprocessor/import_self.c b/clang/test/Preprocessor/import_self.c index e8f6fa793d1..2cabe3d71ca 100644 --- a/clang/test/Preprocessor/import_self.c +++ b/clang/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/clang/test/Preprocessor/include-directive1.c b/clang/test/Preprocessor/include-directive1.c index 3e449c52689..66f70fb3a9e 100644 --- a/clang/test/Preprocessor/include-directive1.c +++ b/clang/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/clang/test/Preprocessor/include-directive2.c b/clang/test/Preprocessor/include-directive2.c index 8309b4508aa..785b77cbdd8 100644 --- a/clang/test/Preprocessor/include-directive2.c +++ b/clang/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/clang/test/Preprocessor/include-directive3.c b/clang/test/Preprocessor/include-directive3.c index 9e22d5d4920..2541301b932 100644 --- a/clang/test/Preprocessor/include-directive3.c +++ b/clang/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/clang/test/Preprocessor/include-pth.c b/clang/test/Preprocessor/include-pth.c index 64b46eb15ec..2bdc7dc8746 100644 --- a/clang/test/Preprocessor/include-pth.c +++ b/clang/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/clang/test/Preprocessor/indent_macro.c b/clang/test/Preprocessor/indent_macro.c index 0dcaa7b4b9a..f6b411e93ff 100644 --- a/clang/test/Preprocessor/indent_macro.c +++ b/clang/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/clang/test/Preprocessor/line-directive.c b/clang/test/Preprocessor/line-directive.c index a1590fa3333..07cfa65e946 100644 --- a/clang/test/Preprocessor/line-directive.c +++ b/clang/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/clang/test/Preprocessor/macro_arg_keyword.c b/clang/test/Preprocessor/macro_arg_keyword.c index 1f9d7e790f4..92b1ae53571 100644 --- a/clang/test/Preprocessor/macro_arg_keyword.c +++ b/clang/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/clang/test/Preprocessor/macro_disable.c b/clang/test/Preprocessor/macro_disable.c index 33b856d8f64..ff861d26219 100644 --- a/clang/test/Preprocessor/macro_disable.c +++ b/clang/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/clang/test/Preprocessor/macro_disable2.c b/clang/test/Preprocessor/macro_disable2.c index 6e1f80469c3..286539e96f4 100644 --- a/clang/test/Preprocessor/macro_disable2.c +++ b/clang/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/clang/test/Preprocessor/macro_disable3.c b/clang/test/Preprocessor/macro_disable3.c index b358a556775..011de3beed3 100644 --- a/clang/test/Preprocessor/macro_disable3.c +++ b/clang/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/clang/test/Preprocessor/macro_disable4.c b/clang/test/Preprocessor/macro_disable4.c index 4858813a0ec..b652b988d02 100644 --- a/clang/test/Preprocessor/macro_disable4.c +++ b/clang/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/clang/test/Preprocessor/macro_expand.c b/clang/test/Preprocessor/macro_expand.c index 69a4835c5a6..a7a80aff427 100644 --- a/clang/test/Preprocessor/macro_expand.c +++ b/clang/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/clang/test/Preprocessor/macro_expandloc.c b/clang/test/Preprocessor/macro_expandloc.c index 00bba6f60d7..ce1efd20a27 100644 --- a/clang/test/Preprocessor/macro_expandloc.c +++ b/clang/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/clang/test/Preprocessor/macro_expandloc2.c b/clang/test/Preprocessor/macro_expandloc2.c index 3a833299fdf..9adf3fd911f 100644 --- a/clang/test/Preprocessor/macro_expandloc2.c +++ b/clang/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/clang/test/Preprocessor/macro_fn_comma_swallow.c b/clang/test/Preprocessor/macro_fn_comma_swallow.c index d4f3bb9940d..4e06f89a160 100644 --- a/clang/test/Preprocessor/macro_fn_comma_swallow.c +++ b/clang/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/clang/test/Preprocessor/macro_fn_disable_expand.c b/clang/test/Preprocessor/macro_fn_disable_expand.c index a9e1d46f06a..d99c01832ea 100644 --- a/clang/test/Preprocessor/macro_fn_disable_expand.c +++ b/clang/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/clang/test/Preprocessor/macro_fn_lparen_scan.c b/clang/test/Preprocessor/macro_fn_lparen_scan.c index 497ef230d26..1056fd82341 100644 --- a/clang/test/Preprocessor/macro_fn_lparen_scan.c +++ b/clang/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/clang/test/Preprocessor/macro_fn_lparen_scan2.c b/clang/test/Preprocessor/macro_fn_lparen_scan2.c index fa4d5047fb0..fb64befaf1e 100644 --- a/clang/test/Preprocessor/macro_fn_lparen_scan2.c +++ b/clang/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/clang/test/Preprocessor/macro_fn_placemarker.c b/clang/test/Preprocessor/macro_fn_placemarker.c index 30c0bcf47fa..ff688ce2d7a 100644 --- a/clang/test/Preprocessor/macro_fn_placemarker.c +++ b/clang/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/clang/test/Preprocessor/macro_fn_preexpand.c b/clang/test/Preprocessor/macro_fn_preexpand.c index 81a7c417268..a392263aef4 100644 --- a/clang/test/Preprocessor/macro_fn_preexpand.c +++ b/clang/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/clang/test/Preprocessor/macro_fn_varargs_iso.c b/clang/test/Preprocessor/macro_fn_varargs_iso.c index 716e920336e..78ad212405c 100644 --- a/clang/test/Preprocessor/macro_fn_varargs_iso.c +++ b/clang/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/clang/test/Preprocessor/macro_fn_varargs_named.c b/clang/test/Preprocessor/macro_fn_varargs_named.c index b3bb72c6431..c2841b1574b 100644 --- a/clang/test/Preprocessor/macro_fn_varargs_named.c +++ b/clang/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/clang/test/Preprocessor/macro_misc.c b/clang/test/Preprocessor/macro_misc.c index 147e827df36..169c5ec772a 100644 --- a/clang/test/Preprocessor/macro_misc.c +++ b/clang/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/clang/test/Preprocessor/macro_not_define.c b/clang/test/Preprocessor/macro_not_define.c index 388481a90e8..a42240bab60 100644 --- a/clang/test/Preprocessor/macro_not_define.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_bad.c b/clang/test/Preprocessor/macro_paste_bad.c index 60caa427438..1ccfdec368c 100644 --- a/clang/test/Preprocessor/macro_paste_bad.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_bcpl_comment.c b/clang/test/Preprocessor/macro_paste_bcpl_comment.c index 9a864d520cc..8bbee5dc2dd 100644 --- a/clang/test/Preprocessor/macro_paste_bcpl_comment.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_c_block_comment.c b/clang/test/Preprocessor/macro_paste_c_block_comment.c index 9299514c51e..86f812421d8 100644 --- a/clang/test/Preprocessor/macro_paste_c_block_comment.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_commaext.c b/clang/test/Preprocessor/macro_paste_commaext.c index e75ac1f5740..e98849b15af 100644 --- a/clang/test/Preprocessor/macro_paste_commaext.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_empty.c b/clang/test/Preprocessor/macro_paste_empty.c index 8b78ecddd68..75504bc22a7 100644 --- a/clang/test/Preprocessor/macro_paste_empty.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_hard.c b/clang/test/Preprocessor/macro_paste_hard.c index be467456bf7..25b6c1994b5 100644 --- a/clang/test/Preprocessor/macro_paste_hard.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_hashhash.c b/clang/test/Preprocessor/macro_paste_hashhash.c index 4ebf55e41f3..42654fd1b18 100644 --- a/clang/test/Preprocessor/macro_paste_hashhash.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_mscomment.c b/clang/test/Preprocessor/macro_paste_mscomment.c index 858337a879b..b0fc57101c6 100644 --- a/clang/test/Preprocessor/macro_paste_mscomment.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_none.c b/clang/test/Preprocessor/macro_paste_none.c index 2ba2820b16c..e978fca2250 100644 --- a/clang/test/Preprocessor/macro_paste_none.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_simple.c b/clang/test/Preprocessor/macro_paste_simple.c index 82b75daf571..2affbac0dec 100644 --- a/clang/test/Preprocessor/macro_paste_simple.c +++ b/clang/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/clang/test/Preprocessor/macro_paste_spacing.c b/clang/test/Preprocessor/macro_paste_spacing.c index 471ebcc0155..130548dbf99 100644 --- a/clang/test/Preprocessor/macro_paste_spacing.c +++ b/clang/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/clang/test/Preprocessor/macro_rescan.c b/clang/test/Preprocessor/macro_rescan.c index 2ceb2923ca0..17b4dc2756f 100644 --- a/clang/test/Preprocessor/macro_rescan.c +++ b/clang/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/clang/test/Preprocessor/macro_rescan2.c b/clang/test/Preprocessor/macro_rescan2.c index 4fae444002d..6914ae0ac5f 100644 --- a/clang/test/Preprocessor/macro_rescan2.c +++ b/clang/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/clang/test/Preprocessor/macro_rescan_varargs.c b/clang/test/Preprocessor/macro_rescan_varargs.c index 3c79d0e9931..ed1056ab1b3 100644 --- a/clang/test/Preprocessor/macro_rescan_varargs.c +++ b/clang/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/clang/test/Preprocessor/macro_rparen_scan.c b/clang/test/Preprocessor/macro_rparen_scan.c index d4e62837ae6..92750988384 100644 --- a/clang/test/Preprocessor/macro_rparen_scan.c +++ b/clang/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/clang/test/Preprocessor/macro_rparen_scan2.c b/clang/test/Preprocessor/macro_rparen_scan2.c index a9ca9d1bb45..41748ac459b 100644 --- a/clang/test/Preprocessor/macro_rparen_scan2.c +++ b/clang/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/clang/test/Preprocessor/macro_space.c b/clang/test/Preprocessor/macro_space.c index 553fddb68f6..4fdbb0a0cee 100644 --- a/clang/test/Preprocessor/macro_space.c +++ b/clang/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/clang/test/Preprocessor/mi_opt.c b/clang/test/Preprocessor/mi_opt.c index 96029dc95ab..aa69e2b4aea 100644 --- a/clang/test/Preprocessor/mi_opt.c +++ b/clang/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/clang/test/Preprocessor/objc-pp.m b/clang/test/Preprocessor/objc-pp.m index 0648acddf6e..866e7e4809a 100644 --- a/clang/test/Preprocessor/objc-pp.m +++ b/clang/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/clang/test/Preprocessor/output_paste_avoid.c b/clang/test/Preprocessor/output_paste_avoid.c index 7fe8788a267..b23d22a7963 100644 --- a/clang/test/Preprocessor/output_paste_avoid.c +++ b/clang/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/clang/test/Preprocessor/paste_bad.c b/clang/test/Preprocessor/paste_bad.c index 89e879957e4..de2417fbf5c 100644 --- a/clang/test/Preprocessor/paste_bad.c +++ b/clang/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/clang/test/Preprocessor/poison.c b/clang/test/Preprocessor/poison.c index 5df4b47918f..9759ae473fe 100644 --- a/clang/test/Preprocessor/poison.c +++ b/clang/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/clang/test/Preprocessor/poison_expansion.c b/clang/test/Preprocessor/poison_expansion.c index 3444bace4d6..45676c8e6cb 100644 --- a/clang/test/Preprocessor/poison_expansion.c +++ b/clang/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/clang/test/Preprocessor/pr2086.c b/clang/test/Preprocessor/pr2086.c index ddf2c166cdd..4df65a4f7c6 100644 --- a/clang/test/Preprocessor/pr2086.c +++ b/clang/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/clang/test/Preprocessor/pragma_microsoft.c b/clang/test/Preprocessor/pragma_microsoft.c index e05126d0dd7..81e90e3de69 100644 --- a/clang/test/Preprocessor/pragma_microsoft.c +++ b/clang/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/clang/test/Preprocessor/pragma_unknown.c b/clang/test/Preprocessor/pragma_unknown.c index ca2bea10e19..e1b040b5cf0 100644 --- a/clang/test/Preprocessor/pragma_unknown.c +++ b/clang/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/clang/test/Preprocessor/print_line_track.c b/clang/test/Preprocessor/print_line_track.c index 505e5f9fae1..539433d1af0 100644 --- a/clang/test/Preprocessor/print_line_track.c +++ b/clang/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/clang/test/Preprocessor/skipping_unclean.c b/clang/test/Preprocessor/skipping_unclean.c index 9efdd648b48..31ce9b460de 100644 --- a/clang/test/Preprocessor/skipping_unclean.c +++ b/clang/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/clang/test/Preprocessor/stringize_misc.c b/clang/test/Preprocessor/stringize_misc.c index b8e4480ef83..251116acad6 100644 --- a/clang/test/Preprocessor/stringize_misc.c +++ b/clang/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/clang/test/Preprocessor/stringize_space.c b/clang/test/Preprocessor/stringize_space.c index 8c83677d679..e41736c8168 100644 --- a/clang/test/Preprocessor/stringize_space.c +++ b/clang/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/clang/test/Preprocessor/stringize_space2.c b/clang/test/Preprocessor/stringize_space2.c index cf81674065b..6a96894de6e 100644 --- a/clang/test/Preprocessor/stringize_space2.c +++ b/clang/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/clang/test/Preprocessor/undef-error.c b/clang/test/Preprocessor/undef-error.c index a2769345bab..f818e59a6d1 100644 --- a/clang/test/Preprocessor/undef-error.c +++ b/clang/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/clang/test/Preprocessor/unterminated.c b/clang/test/Preprocessor/unterminated.c index 59bcae831d8..2040aac17de 100644 --- a/clang/test/Preprocessor/unterminated.c +++ b/clang/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}} /* /* */ |
