[cfe-commits] r48456 - /cfe/trunk/test/Makefile.parallel

[Gabor Greif]

Author: ggreif
Date: Mon Mar 17 10:37:09 2008
New Revision: 48456

URL: http://llvm.org/viewvc/llvm-project?rev=48456&view=rev
Log:
Get rid of the creation of secondary makefile "Makefile.tests".

This implements second part of
<http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20080310/004727.html>.

Modified:
    cfe/trunk/test/Makefile.parallel

Modified: cfe/trunk/test/Makefile.parallel
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Makefile.parallel?rev=48456&r1=48455&r2=48456&view=diff

==============================================================================
--- cfe/trunk/test/Makefile.parallel (original)
+++ cfe/trunk/test/Makefile.parallel Mon Mar 17 10:37:09 2008
@@ -10,34 +10,22 @@
 
 TESTS = $(addsuffix .testresults, $(shell find $(TESTDIRS) \( -name '*.c' -or -name '*.cpp' -or -name '*.m' \)))
 
-Makefile.tests:
-	@ echo '%.testresults: %' > $@
-	@ echo "^@ printf '.'" | tr "^" "\t" >> $@
-	@ echo "^@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts ./TestRunner.sh &< > &@ || (echo; echo '----' &! 'failed ----')" | tr '^!&' '\t^$$' >> $@
-	@ echo >> $@
-	@ echo "TESTS = $(TESTS)" >> $@
-	@ echo '  ' >> $@
-	@ echo >> $@
-	@ echo "all:: &(TESTS)" | tr "&" '$$' >> $@
-	@ echo >> $@
-	@ echo "report: &(TESTS)" | tr "&" '$$' >> $@
-	@ echo "^@ cat $$<" | tr "^&<" "\t$$^" >> $@
-	@ echo >> $@
-	@ echo "clean:" | tr "&" '$$' >> $@
-	@ echo "^@ rm -f &(TESTS)" | tr "^&<" "\t$$^" >> $@
-	@ echo >> $@
-	@ echo ".PHONY: all report clean" >> $@
+%.testresults: %
+	@ printf '.'
+	@ PATH=$$PATH:$(ToolDir):$(LLVM_SRC_ROOT)/test/Scripts ./TestRunner.sh $< > $@ || (echo; echo '----' $< 'failed ----')
 
-all:: Makefile.tests
+all::
 	@ echo '--- Running clang tests ---'
-	@ $(MAKE) -f $< clean
-	@ $(MAKE) -f $< all
-	@ echo "^@ echo" | tr "^" "\t" >> $@
-	@ $(MAKE) -f $< report
-	@ $(MAKE) -f $< clean
-	@ rm $<
+	@ $(MAKE) -f Makefile.parallel testclean
+	@ $(MAKE) -f Makefile.parallel $(TESTS)
+	@ echo
+	@ $(MAKE) -f Makefile.parallel report
+	@ $(MAKE) -f Makefile.parallel testclean
 
-.PHONY: all
+report: $(TESTS)
+	@ cat $^
 
-.NOTPARALLEL:
+testclean:
+	@ rm -f $(TESTS)
 
+.PHONY: all report testclean