Switch tests in test/Headers to use %clang_cc1 rather than %clang. There

is no need to go through the driver indirection here, and it clutters
things up as dependencies can sneak in for specific things the driver is
doing.

llvm-svn: 191107

8 files changed, 16 insertions, 14 deletions

diff --git a/clang/test/Headers/c11.c b/clang/test/Headers/c11.c
index 21f2e4f2224..11bec195446 100644
--- a/clang/test/Headers/c11.c
+++ b/clang/test/Headers/c11.c
@@ -1,6 +1,6 @@
-// RUN: %clang -fsyntax-only -Xclang -verify -std=c11 %s
-// RUN: %clang -fsyntax-only -Xclang -verify -std=c11 -fmodules %s
-// RUN: %clang -fsyntax-only -Xclang -verify -std=c11 -ffreestanding %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c11 %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c11 -fmodules %s
+// RUN: %clang_cc1 -fsyntax-only -verify -std=c11 -ffreestanding %s
 
 noreturn int f(); // expected-error 1+{{}}
 
diff --git a/clang/test/Headers/c89.c b/clang/test/Headers/c89.c
index acf01b40e06..6188df5487b 100644
--- a/clang/test/Headers/c89.c
+++ b/clang/test/Headers/c89.c
@@ -1,4 +1,4 @@
-// RUN: %clang -target i386-apple-darwin10 -fsyntax-only -Xclang -verify -std=c89 %s
+// RUN: %clang_cc1 -triple i386-apple-darwin10 -target-cpu yonah -fsyntax-only -verify -std=c89 %s
 // expected-no-diagnostics
 
 // FIXME: Disable inclusion of mm_malloc.h, our current implementation is broken
diff --git a/clang/test/Headers/cxx11.cpp b/clang/test/Headers/cxx11.cpp
index fa37be3b516..1a4b6400e09 100644
--- a/clang/test/Headers/cxx11.cpp
+++ b/clang/test/Headers/cxx11.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang -ffreestanding -fsyntax-only -std=c++11 %s
-// RUN: %clang -ffreestanding -fsyntax-only -std=c++11 -fmodules %s
+// RUN: %clang_cc1 -ffreestanding -fsyntax-only -std=c++11 %s
+// RUN: %clang_cc1 -ffreestanding -fsyntax-only -std=c++11 -fmodules %s
 
 #include <stdalign.h>
 
diff --git a/clang/test/Headers/ms-intrin.cpp b/clang/test/Headers/ms-intrin.cpp
index 263c09047ae..58ad5a2449c 100644
--- a/clang/test/Headers/ms-intrin.cpp
+++ b/clang/test/Headers/ms-intrin.cpp
@@ -1,4 +1,6 @@
-// RUN: %clang -target i386-pc-win32 -fms-extensions -ffreestanding -fsyntax-only %s
+// RUN: %clang_cc1 -triple i386-pc-win32 -target-cpu pentium4 \
+// RUN:     -fms-extensions -fms-compatibility -fmsc-version=1700 \
+// RUN:     -ffreestanding -fsyntax-only %s
 
 // Intrin.h needs size_t, but -ffreestanding prevents us from getting it from
 // stddef.h.  Work around it with this typedef.
diff --git a/clang/test/Headers/ms-null-ms-header-vs-stddef.cpp b/clang/test/Headers/ms-null-ms-header-vs-stddef.cpp
index 7efa871da90..237ed51f965 100644
--- a/clang/test/Headers/ms-null-ms-header-vs-stddef.cpp
+++ b/clang/test/Headers/ms-null-ms-header-vs-stddef.cpp
@@ -1,5 +1,5 @@
-// RUN: %clang -fsyntax-only -target i686-pc-win32 %s
-// RUN: %clang -fsyntax-only -target i386-mingw32 %s
+// RUN: %clang_cc1 -fsyntax-only -triple i686-pc-win32 -fms-compatibility -fmsc-version=1700 %s
+// RUN: %clang_cc1 -fsyntax-only -triple i386-mingw32 %s
 
 // Something in MSVC's headers (pulled in e.g. by <crtdefs.h>) defines __null
 // to something, mimick that.
diff --git a/clang/test/Headers/ms-wchar.c b/clang/test/Headers/ms-wchar.c
index f015fc77ee5..fee7e72bd42 100644
--- a/clang/test/Headers/ms-wchar.c
+++ b/clang/test/Headers/ms-wchar.c
@@ -1,4 +1,4 @@
-// RUN: %clang -fsyntax-only -target i386-pc-win32 %s
+// RUN: %clang_cc1 -fsyntax-only -triple i386-pc-win32 -fms-compatibility %s
 
 #if defined(_WCHAR_T_DEFINED)
 #error "_WCHAR_T_DEFINED should not be defined in C99"
diff --git a/clang/test/Headers/tgmath.c b/clang/test/Headers/tgmath.c
index b6694369834..4235ae20719 100644
--- a/clang/test/Headers/tgmath.c
+++ b/clang/test/Headers/tgmath.c
@@ -1,4 +1,4 @@
-// RUN: %clang -fsyntax-only -isystem %S/Inputs/include -Xclang -verify %s
+// RUN: %clang_cc1 -fsyntax-only -isystem %S/Inputs/include -verify %s
 // expected-no-diagnostics
 
 #include <tgmath.h>
diff --git a/clang/test/Headers/x86-intrinsics-headers.c b/clang/test/Headers/x86-intrinsics-headers.c
index bdffddedfc7..91c4ffaa0ed 100644
--- a/clang/test/Headers/x86-intrinsics-headers.c
+++ b/clang/test/Headers/x86-intrinsics-headers.c
@@ -1,6 +1,6 @@
-// RUN: %clang -fsyntax-only -ffreestanding %s
-// RUN: %clang -fsyntax-only -ffreestanding -fno-lax-vector-conversions %s
-// RUN: %clangxx -fsyntax-only -ffreestanding -x c++ %s
+// RUN: %clang_cc1 -fsyntax-only -ffreestanding %s
+// RUN: %clang_cc1 -fsyntax-only -ffreestanding -fno-lax-vector-conversions %s
+// RUN: %clang_cc1 -fsyntax-only -ffreestanding -x c++ %s
 
 #if defined(i386) || defined(__x86_64__)