From 947a8b59b771130741ad65522da1841cd4752b32 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Mon, 17 Mar 2008 15:07:59 +0000 Subject: [PATCH] More review feedback implemented: Get rid of "awk" dependence by using same "make" functionality: git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@48455 91177308-0d34-0410-b5e6-96231b3b80d8 --- test/Makefile.parallel | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/test/Makefile.parallel b/test/Makefile.parallel index 5ab240ba8b..28daebf0b3 100644 --- a/test/Makefile.parallel +++ b/test/Makefile.parallel @@ -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 @@ ifeq ($(OS),Darwin) 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 @@ Makefile.tests: 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 $< -- 2.40.0