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

[Gabor Greif]

Author: ggreif
Date: Thu Apr 17 05:16:38 2008
New Revision: 49845

URL: http://llvm.org/viewvc/llvm-project?rev=49845&view=rev
Log:
massage output to appear like before

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=49845&r1=49844&r2=49845&view=diff

==============================================================================
--- llvm/branches/ggreif/parallelized-test/Makefile (original)
+++ llvm/branches/ggreif/parallelized-test/Makefile Thu Apr 17 05:16:38 2008
@@ -63,20 +63,34 @@
 	@ cat $^
 
 %.report:: $(addsuffix .out, $(shell find $(TESTDIRS) -name Test.makefile))
-	@ cat $^ | grep "^$(basename $@): " | wc -l | xargs echo "$(basename $@):" | (grep -v ': 0' ; true) > $@
+	@ cat $^ \
+	| grep "^$(basename $@): " \
+	| wc -l \
+	| xargs echo "$(basename $@):" \
+	| (grep -v ': 0$$' ; true) > $@
 
 .PHONY: report
 
+PRETTIFY-DEJA = sed \
+		-e 's/Running /Preparing /1' \
+		-e 's/		===  Summary ===/--- Running llvm tests ---/1' \
+		-e 's/		=== /--- Running /1' \
+		-e 's/ Summary ===/ tests ---/1'
+
+PRETTIFY-REPORT = sed \
+		-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'
+
 check-local:: site.exp
-	@ ( ulimit -t 600 ; ulimit -d 512000 ; \
-	  PATH="$(LLVMToolDir):$(LLVM_SRC_ROOT)/test/Scripts:$(PATH)" \
-	  $(RUNTEST) $(RUNTESTFLAGS) ) | sed -e 's/Running /Preparing /1'
-	@ echo '--- Running llvm tests ---'
+	@ ( 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)))
 	@ $(DONE)
 	@ $(MAKE) -f $(LLVM_SRC_ROOT)/test/Makefile --always-make PASS.report FAIL.report XPASS.report XFAIL.report
-	@ cat PASS.report FAIL.report XPASS.report XFAIL.report
+	@ cat PASS.report FAIL.report XPASS.report XFAIL.report | $(PRETTIFY-REPORT)
 else
 check-local:: site.exp
 	@echo "*** dejagnu not found.  Make sure runtest is in your PATH, then reconfigure llvm."