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

[Gabor Greif]

Author: ggreif
Date: Mon Mar 17 10:07:59 2008
New Revision: 48455

URL: http://llvm.org/viewvc/llvm-project?rev=48455&view=rev
Log:
More review feedback implemented:

Get rid of "awk" dependence by using same "make"
functionality:

<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=48455&r1=48454&r2=48455&view=diff

==============================================================================
--- cfe/trunk/test/Makefile.parallel (original)
+++ cfe/trunk/test/Makefile.parallel Mon Mar 17 10:07:59 2008
@@ -1,8 +1,6 @@
 LEVEL = ../../..
 include $(LEVEL)/Makefile.common
 
-AWK = awk
-
 TESTDIRS = CodeGen Lexer Preprocessor Parser Sema Analysis Serialization
 
 # Only run rewriter tests on darwin.
@@ -10,16 +8,14 @@
 TESTDIRS += Rewriter
 endif
 
+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 =" \\ >> $@
-	@ find $(TESTDIRS) \
-	  \( -name '*.c' -or -name '*.cpp' -or -name '*.m' \) \
-	| $(AWK) '{print "  " $$0 ".testresults \\"}' >> $@
+	@ echo "TESTS = $(TESTS)" >> $@
 	@ echo '  ' >> $@
 	@ echo >> $@
 	@ echo "all:: &(TESTS)" | tr "&" '$$' >> $@
@@ -35,7 +31,9 @@
 all:: Makefile.tests
 	@ echo '--- Running clang tests ---'
 	@ $(MAKE) -f $< clean
-	@ $(MAKE) -f $< all report
+	@ $(MAKE) -f $< all
+	@ echo "^@ echo" | tr "^" "\t" >> $@
+	@ $(MAKE) -f $< report
 	@ $(MAKE) -f $< clean
 	@ rm $<