aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/Makefile2
-rw-r--r--test/Preprocessor/assembler-with-cpp.S6
2 files changed, 7 insertions, 1 deletions
diff --git a/test/Makefile b/test/Makefile
index 5ef0e02402..81a1d790fc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -19,7 +19,7 @@ REPORTFAIL = (echo; echo '----' $< 'failed ----')
DONE = echo
endif
-TESTS := $(addprefix Output/, $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' -or -name '*.mm' \) | grep -v "Output/")))
+TESTS := $(addprefix Output/, $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' -or -name '*.mm' -or -name '*.S' \) | grep -v "Output/")))
Output/%.testresults: %
@ $(PROGRESS)
@ PATH=$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$$PATH VG=$(VG) $(PROJ_SRC_DIR)/TestRunner.sh $< > $@ || $(REPORTFAIL)
diff --git a/test/Preprocessor/assembler-with-cpp.S b/test/Preprocessor/assembler-with-cpp.S
new file mode 100644
index 0000000000..2c2bd8df97
--- /dev/null
+++ b/test/Preprocessor/assembler-with-cpp.S
@@ -0,0 +1,6 @@
+// RUN: clang -E %s &&
+// RUN: not clang -x c -E %s
+
+#ifndef __ASSEMBLER__
+#error "__ASSEMBLER__ not defined"
+#endif