Another attempt to make test/Makefile return correct error code.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@56285 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/test/Makefile b/test/Makefile
index d8e34b1096b82c015611a113b68e7e8bf5bfc78d..0963fee542ca04e73acab2a9bd32669fd57974ff 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -20,7 +20,6 @@ DONE = echo
 endif
 
 TESTS := $(addprefix Output/, $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' -or -name '*.mm' \))))
-
 Output/%.testresults: %
        @ $(PROGRESS)
        @ PATH=$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$$PATH VG=$(VG) $(PROJ_SRC_DIR)/TestRunner.sh $< > $@ || $(REPORTFAIL)
@@ -31,7 +30,7 @@ all::
        @ echo '--- Running clang tests ---'
        @ $(MAKE) $(TESTS)
        @ $(DONE)
-       @ cat $(TESTS) | grep -v 'XFAILED' | grep -v ' HAS NO RUN LINE! ****' | $(LLVM_SRC_ROOT)/test/Scripts/count 0 > /dev/null
+       @ !(cat $(TESTS) | grep -q " FAILED! ")
 
 report: $(TESTS)
        @ cat $^