diff options
| -rw-r--r-- | test/Makefile.parallel | 3 | ||||
| -rwxr-xr-x | test/TestRunner.sh | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/test/Makefile.parallel b/test/Makefile.parallel index 8162f816e7..5ab240ba8b 100644 --- a/test/Makefile.parallel +++ b/test/Makefile.parallel @@ -14,7 +14,7 @@ endif Makefile.tests: @ echo '%.testresults: %' > $@ @ echo "^@ printf '.'" | tr "^" "\t" >> $@ - @ echo "^@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts ./TestRunner.sh &< > &@ || echo $$^" | tr "^&" '\t$$' >> $@ + @ echo "^@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts ./TestRunner.sh &< > &@ || (echo; echo '----' &! 'failed ----')" | tr '^!&' '\t^$$' >> $@ @ echo >> $@ @ echo "TESTS =" \\ >> $@ @ find $(TESTDIRS) \ @@ -33,6 +33,7 @@ Makefile.tests: @ echo ".PHONY: all report clean" >> $@ all:: Makefile.tests + @ echo '--- Running clang tests ---' @ $(MAKE) -f $< clean @ $(MAKE) -f $< all report @ $(MAKE) -f $< clean diff --git a/test/TestRunner.sh b/test/TestRunner.sh index cbbed75fa5..b649fab9cc 100755 --- a/test/TestRunner.sh +++ b/test/TestRunner.sh @@ -52,5 +52,6 @@ grep -q XFAIL $FILENAME && (printf "XFAILED '$TESTNAME': "; grep XFAIL $FILENAME cat $OUTPUT rm $OUTPUT echo "******************** TEST '$TESTNAME' FAILED! ********************" + exit 1 ) |