[llvm-commits] [llvm] r49849 - /llvm/branches/ggreif/parallelized-test/Makefile

[Gabor Greif]

Author: ggreif
Date: Thu Apr 17 07:08:55 2008
New Revision: 49849

URL: http://llvm.org/viewvc/llvm-project?rev=49849&view=rev
Log:
do not unnecessarily traverse dirs searching

Modified:
    llvm/branches/ggreif/parallelized-test/Makefile

Modified: llvm/branches/ggreif/parallelized-test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/parallelized-test/Makefile?rev=49849&r1=49848&r2=49849&view=diff

==============================================================================
--- llvm/branches/ggreif/parallelized-test/Makefile (original)
+++ llvm/branches/ggreif/parallelized-test/Makefile Thu Apr 17 07:08:55 2008
@@ -58,13 +58,17 @@
 PREPARATION = -e '/Running \(.*\) \.\.\./d'
 endif
 
+ifndef TESTDIRS-MAKEFILES
+TESTDIRS-MAKEFILES := $(shell echo "Z" >> Z && find $(TESTDIRS) -name Test.makefile)
+endif
+
 %.makefile.out: %.makefile
 	@ $(MAKE) --always-make -C $(dir $<) -f $(notdir $<) $(notdir $@)
 
-report:: $(addsuffix .out, $(shell find $(TESTDIRS) -name Test.makefile))
+report:: $(addsuffix .out, $(TESTDIRS-MAKEFILES))
 	@ cat $^
 
-%.report:: $(addsuffix .out, $(shell find $(TESTDIRS) -name Test.makefile))
+%.report:: $(addsuffix .out, $(TESTDIRS-MAKEFILES))
 	@ cat $^ \
 	| grep "^$(basename $@): " \
 	| wc -l \
@@ -79,18 +83,20 @@
 		-e 's/		=== \(.*\) Summary ===/		=== Running \1 tests ===/1'
 
 PRETTIFY-REPORT = sed \
-		-e 's/XPASS: /\# of unexpected successes		/1' \
+		-e 's/XPASS: /\# of unexpected successes	/1' \
 		-e 's/PASS: /\# of expected passes		/1' \
 		-e 's/XFAIL: /\# of expected failures		/1' \
-		-e 's/FAIL: /\# of unexpected failures		/1'
+		-e 's/FAIL: /\# of unexpected failures	/1'
 
 check-local:: site.exp
 	@ ( PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
 			$(RUNTEST) $(RUNTESTFLAGS) ) | $(PRETTIFY-DEJA)
 	@ ( ulimit -t 600 ; ulimit -d 512000 ; \
-	    $(MAKE) -f $(LLVM_SRC_ROOT)/test/Makefile $(addsuffix .out, $(shell find $(TESTDIRS) -name Test.makefile)))
+	    $(MAKE) -f $(LLVM_SRC_ROOT)/test/Makefile TESTDIRS-MAKEFILES="$(TESTDIRS-MAKEFILES)" \
+		$(addsuffix .out, $(TESTDIRS-MAKEFILES)))
 	@ $(DONE)
-	@ $(MAKE) -f $(LLVM_SRC_ROOT)/test/Makefile --always-make PASS.report FAIL.report XPASS.report XFAIL.report
+	@ $(MAKE) -f $(LLVM_SRC_ROOT)/test/Makefile --always-make TESTDIRS-MAKEFILES="$(TESTDIRS-MAKEFILES)" \
+		PASS.report FAIL.report XPASS.report XFAIL.report
 	@ echo
 	@ echo "		=== $(TESTDIRS) Summary ==="
 	@ echo