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

[Saleem Abdulrasool]

Author: compnerd
Date: Tue Jul  8 15:21:29 2014
New Revision: 212563

URL: http://llvm.org/viewvc/llvm-project?rev=212563&view=rev
Log:
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.

Removed:
    cfe/trunk/test/Headers/arm-intrin.c
Modified:
    cfe/trunk/test/Headers/ms-intrin.cpp

Removed: cfe/trunk/test/Headers/arm-intrin.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/arm-intrin.c?rev=212562&view=auto
==============================================================================
--- cfe/trunk/test/Headers/arm-intrin.c (original)
+++ cfe/trunk/test/Headers/arm-intrin.c (removed)
@@ -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>
-

Modified: cfe/trunk/test/Headers/ms-intrin.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Headers/ms-intrin.cpp?rev=212563&r1=212562&r2=212563&view=diff
==============================================================================
--- cfe/trunk/test/Headers/ms-intrin.cpp (original)
+++ cfe/trunk/test/Headers/ms-intrin.cpp Tue Jul  8 15:21:29 2014
@@ -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;