Simplify further by creating *.testresults files
inside of the Output/ directory.
The testclean target could be removed now.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@48457 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/test/Makefile.parallel b/test/Makefile.parallel
index c110edb..bc4209c 100644
--- a/test/Makefile.parallel
+++ b/test/Makefile.parallel
@@ -8,24 +8,20 @@
TESTDIRS += Rewriter
endif
-TESTS = $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' \)))
+TESTS = $(addprefix Output/, $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' \))))
-%.testresults: %
+Output/%.testresults: %
@ printf '.'
@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts ./TestRunner.sh $< > $@ || (echo; echo '----' $< 'failed ----')
all::
+ @ rm -f $(TESTS)
@ echo '--- Running clang tests ---'
- @ $(MAKE) -f Makefile.parallel testclean
@ $(MAKE) -f Makefile.parallel $(TESTS)
@ echo
@ $(MAKE) -f Makefile.parallel report
- @ $(MAKE) -f Makefile.parallel testclean
report: $(TESTS)
@ cat $^
-testclean:
- @ rm -f $(TESTS)
-
-.PHONY: all report testclean
+.PHONY: all report