Update tests to use %clang_cc1 instead of 'clang-cc' or 'clang -cc1'.
- This is designed to make it obvious that %clang_cc1 is a "test variable"
which is substituted. It is '%clang_cc1' instead of '%clang -cc1' because it
can be useful to redefine what gets run as 'clang -cc1' (for example, to set
a default target).
llvm-svn: 91446
diff --git a/clang/test/Lexer/11-27-2007-FloatLiterals.c b/clang/test/Lexer/11-27-2007-FloatLiterals.c
index ab3aba1..ccd9e2e 100644
--- a/clang/test/Lexer/11-27-2007-FloatLiterals.c
+++ b/clang/test/Lexer/11-27-2007-FloatLiterals.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -emit-llvm -o - | FileCheck %s
+// RUN: %clang_cc1 %s -emit-llvm -o - | FileCheck %s
// CHECK: 0x3BFD83C940000000
// CHECK: 2.000000e+{{[0]*}}32
diff --git a/clang/test/Lexer/badstring_in_if0.c b/clang/test/Lexer/badstring_in_if0.c
index 5fa5a2b..486dcf2 100644
--- a/clang/test/Lexer/badstring_in_if0.c
+++ b/clang/test/Lexer/badstring_in_if0.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E %s 2>&1 | not grep error
+// RUN: %clang_cc1 -E %s 2>&1 | not grep error
#if 0
"
diff --git a/clang/test/Lexer/block_cmt_end.c b/clang/test/Lexer/block_cmt_end.c
index 5efb77e..72bc836 100644
--- a/clang/test/Lexer/block_cmt_end.c
+++ b/clang/test/Lexer/block_cmt_end.c
@@ -1,9 +1,9 @@
/*
- RUN: clang-cc -E -trigraphs %s | grep bar
- RUN: clang-cc -E -trigraphs %s | grep foo
- RUN: clang-cc -E -trigraphs %s | not grep abc
- RUN: clang-cc -E -trigraphs %s | not grep xyz
- RUN: clang-cc -fsyntax-only -trigraphs -verify %s
+ RUN: %clang_cc1 -E -trigraphs %s | grep bar
+ RUN: %clang_cc1 -E -trigraphs %s | grep foo
+ RUN: %clang_cc1 -E -trigraphs %s | not grep abc
+ RUN: %clang_cc1 -E -trigraphs %s | not grep xyz
+ RUN: %clang_cc1 -fsyntax-only -trigraphs -verify %s
*/
// This is a simple comment, /*/ does not end a comment, the trailing */ does.
diff --git a/clang/test/Lexer/c90.c b/clang/test/Lexer/c90.c
index d743d68..6293d42 100644
--- a/clang/test/Lexer/c90.c
+++ b/clang/test/Lexer/c90.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc -std=c90 -fsyntax-only %s -verify -pedantic-errors
+/* RUN: %clang_cc1 -std=c90 -fsyntax-only %s -verify -pedantic-errors
*/
enum { cast_hex = (long) (
diff --git a/clang/test/Lexer/char-escapes.c b/clang/test/Lexer/char-escapes.c
index ef665fe..d918bf4 100644
--- a/clang/test/Lexer/char-escapes.c
+++ b/clang/test/Lexer/char-escapes.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -pedantic -verify %s
+// RUN: %clang_cc1 -fsyntax-only -pedantic -verify %s
int test['\\' == 92 ? 1 : -1];
int test['\"' == 34 ? 1 : -1];
diff --git a/clang/test/Lexer/conflict-marker.c b/clang/test/Lexer/conflict-marker.c
index be2672b..f86111c 100644
--- a/clang/test/Lexer/conflict-marker.c
+++ b/clang/test/Lexer/conflict-marker.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -verify -fsyntax-only
+// RUN: %clang_cc1 %s -verify -fsyntax-only
// Test that we recover gracefully from conflict markers left in input files.
// PR5238
diff --git a/clang/test/Lexer/constants-ms.c b/clang/test/Lexer/constants-ms.c
index 8176ec3..5b3f826 100644
--- a/clang/test/Lexer/constants-ms.c
+++ b/clang/test/Lexer/constants-ms.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -fms-extensions %s
+// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s
__int8 x1 = 3i8;
__int16 x2 = 4i16;
diff --git a/clang/test/Lexer/constants.c b/clang/test/Lexer/constants.c
index fcb6de9..72e0dc4 100644
--- a/clang/test/Lexer/constants.c
+++ b/clang/test/Lexer/constants.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -pedantic -trigraphs %s
+// RUN: %clang_cc1 -fsyntax-only -verify -pedantic -trigraphs %s
int x = 000000080; // expected-error {{invalid digit}}
diff --git a/clang/test/Lexer/cxx0x_keyword.cpp b/clang/test/Lexer/cxx0x_keyword.cpp
index 412c25e..c27925b 100644
--- a/clang/test/Lexer/cxx0x_keyword.cpp
+++ b/clang/test/Lexer/cxx0x_keyword.cpp
@@ -1,2 +1,2 @@
-// RUN: clang-cc -fsyntax-only -verify -std=c++0x %s 2>&1
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c++0x %s 2>&1
int static_assert; /* expected-error {{expected unqualified-id}} */
diff --git a/clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp b/clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp
index 9f8aea12..2bfb8b0 100644
--- a/clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp
+++ b/clang/test/Lexer/cxx0x_keyword_as_cxx98.cpp
@@ -1,2 +1,2 @@
-// RUN: clang-cc %s -fsyntax-only
+// RUN: %clang_cc1 %s -fsyntax-only
int static_assert;
diff --git a/clang/test/Lexer/digraph.c b/clang/test/Lexer/digraph.c
index 3c92db1..b8a99bb 100644
--- a/clang/test/Lexer/digraph.c
+++ b/clang/test/Lexer/digraph.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify < %s
+// RUN: %clang_cc1 -fsyntax-only -verify < %s
%:include <stdint.h>
diff --git a/clang/test/Lexer/dollar-idents.c b/clang/test/Lexer/dollar-idents.c
index 276545d..cbf25b0 100644
--- a/clang/test/Lexer/dollar-idents.c
+++ b/clang/test/Lexer/dollar-idents.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -dump-tokens %s 2> %t
+// RUN: %clang_cc1 -dump-tokens %s 2> %t
// RUN: grep "identifier '\$A'" %t
-// RUN: clang-cc -dump-tokens -x assembler-with-cpp %s 2> %t
+// RUN: %clang_cc1 -dump-tokens -x assembler-with-cpp %s 2> %t
// RUN: grep "identifier 'A'" %t
// PR3808
diff --git a/clang/test/Lexer/escape_newline.c b/clang/test/Lexer/escape_newline.c
index d07f045..43ba417 100644
--- a/clang/test/Lexer/escape_newline.c
+++ b/clang/test/Lexer/escape_newline.c
@@ -1,6 +1,6 @@
-// RUN: clang-cc -E -trigraphs %s | grep -- ' ->'
-// RUN: clang-cc -E -trigraphs %s 2>&1 | grep 'backslash and newline separated by space'
-// RUN: clang-cc -E -trigraphs %s 2>&1 | grep 'trigraph converted'
+// RUN: %clang_cc1 -E -trigraphs %s | grep -- ' ->'
+// RUN: %clang_cc1 -E -trigraphs %s 2>&1 | grep 'backslash and newline separated by space'
+// RUN: %clang_cc1 -E -trigraphs %s 2>&1 | grep 'trigraph converted'
// This is an ugly way to spell a -> token.
-??/
diff --git a/clang/test/Lexer/msdos-cpm-eof.c b/clang/test/Lexer/msdos-cpm-eof.c
index e4dacd9..0a6956d 100644
--- a/clang/test/Lexer/msdos-cpm-eof.c
+++ b/clang/test/Lexer/msdos-cpm-eof.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -fsyntax-only -verify -fms-extensions %s
+// RUN: %clang_cc1 -fsyntax-only -verify -fms-extensions %s
int a;
diff --git a/clang/test/Lexer/multiple-include.c b/clang/test/Lexer/multiple-include.c
index e5fd529..d737f95 100644
--- a/clang/test/Lexer/multiple-include.c
+++ b/clang/test/Lexer/multiple-include.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only
+// RUN: %clang_cc1 %s -fsyntax-only
#ifndef XVID_AUTO_INCLUDE
diff --git a/clang/test/Lexer/numeric-literal-trash.c b/clang/test/Lexer/numeric-literal-trash.c
index 047e0b8..1d7c87b 100644
--- a/clang/test/Lexer/numeric-literal-trash.c
+++ b/clang/test/Lexer/numeric-literal-trash.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc -fsyntax-only -verify %s
+/* RUN: %clang_cc1 -fsyntax-only -verify %s
*/
# define XRECORD(x, c_name) e##c (x, __LINE__)
diff --git a/clang/test/Lexer/pragma-mark.c b/clang/test/Lexer/pragma-mark.c
index f4204aa..96e8485 100644
--- a/clang/test/Lexer/pragma-mark.c
+++ b/clang/test/Lexer/pragma-mark.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc %s -fsyntax-only -verify
+// RUN: %clang_cc1 %s -fsyntax-only -verify
// Lexer diagnostics shouldn't be included in #pragma mark.
#pragma mark Mike's world
diff --git a/clang/test/Lexer/rdr-6096838-2.c b/clang/test/Lexer/rdr-6096838-2.c
index b135dc1..f7f5906 100644
--- a/clang/test/Lexer/rdr-6096838-2.c
+++ b/clang/test/Lexer/rdr-6096838-2.c
@@ -1,4 +1,4 @@
-/* RUN: clang-cc -pedantic -std=gnu89 -fsyntax-only -verify %s
+/* RUN: %clang_cc1 -pedantic -std=gnu89 -fsyntax-only -verify %s
rdar://6096838
*/
diff --git a/clang/test/Lexer/rdr-6096838.c b/clang/test/Lexer/rdr-6096838.c
index 6a8899a..2f00f47 100644
--- a/clang/test/Lexer/rdr-6096838.c
+++ b/clang/test/Lexer/rdr-6096838.c
@@ -1,5 +1,5 @@
-/* RUN: clang-cc -fsyntax-only -verify %s
- * RUN: clang-cc -std=gnu89 -fsyntax-only -verify %s
+/* RUN: %clang_cc1 -fsyntax-only -verify %s
+ * RUN: %clang_cc1 -std=gnu89 -fsyntax-only -verify %s
rdar://6096838
*/
diff --git a/clang/test/Lexer/token-concat-2.c b/clang/test/Lexer/token-concat-2.c
index 2891654..7d3cd64 100644
--- a/clang/test/Lexer/token-concat-2.c
+++ b/clang/test/Lexer/token-concat-2.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -x c -o - %s | grep '[.][*]'
+// RUN: %clang_cc1 -E -x c -o - %s | grep '[.][*]'
// PR4395
#define X .*
X
diff --git a/clang/test/Lexer/token-concat.c b/clang/test/Lexer/token-concat.c
index 9194932..551af95 100644
--- a/clang/test/Lexer/token-concat.c
+++ b/clang/test/Lexer/token-concat.c
@@ -1,4 +1,4 @@
-// RUN: clang-cc -E -x c -o %t %s
+// RUN: %clang_cc1 -E -x c -o %t %s
// RUN: grep 'IDENT.2' %t
IDENT.2
diff --git a/clang/test/Lexer/unknown-char.c b/clang/test/Lexer/unknown-char.c
index acbf4f0..334df37 100644
--- a/clang/test/Lexer/unknown-char.c
+++ b/clang/test/Lexer/unknown-char.c
@@ -1,2 +1,2 @@
-// RUN: clang-cc -E %s 2>&1 | not grep error
+// RUN: %clang_cc1 -E %s 2>&1 | not grep error
` ` ` `