test: merge arm-intrin into ms-intrin, fix invocation

This merges the two tests into one since there is no real reason to separate
them.  It also fixes the test invocation to specify -fms-compatibility without
which we would end up without an Intrin.h header.

llvm-svn: 212563

diff --git a/clang/test/Headers/arm-intrin.c b/clang/test/Headers/arm-intrin.c
deleted file mode 100644 (file)
index 294bc33..0000000
--- a/clang/test/Headers/arm-intrin.c
+++ /dev/null
@@ -1,6 +0,0 @@
-// RUN: %clang -target armv7-windows -I %S/Inputs/include -Xclang -verify -E %s
-// expected-no-diagnostics
-
-typedef __SIZE_TYPE__ size_t;
-#include <Intrin.h>
-

diff --git a/clang/test/Headers/ms-intrin.cpp b/clang/test/Headers/ms-intrin.cpp
index 03f57a5..d2cc627 100644 (file)
--- a/clang/test/Headers/ms-intrin.cpp
+++ b/clang/test/Headers/ms-intrin.cpp
@@ -8,6 +8,11 @@
 // RUN:     -ffreestanding -fsyntax-only -Werror \
 // RUN:     -isystem %S/Inputs/include %s
 
+// RUN: %clang_cc1 -triple thumbv7--windows \
+// RUN:     -ffreestanding -fsyntax-only -fms-compatibility -fmsc-version=1700 \
+// RUN:     -Werror \
+// RUN:     -isystem %S/Inputs/include %s
+
 // Intrin.h needs size_t, but -ffreestanding prevents us from getting it from
 // stddef.h.  Work around it with this typedef.
 typedef __SIZE_TYPE__ size_t;