[llvm-commits] [test-suite] r101769 - /test-suite/trunk/TEST.nightly.Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Sun Apr 18 23:01:05 2010
New Revision: 101769

URL: http://llvm.org/viewvc/llvm-project?rev=101769&view=rev
Log:
Fix a possible make failure when generating *.report.txt files on failures. I
believe this is the source of nightlytest "sometimes" dropping test results for
parallel make, when there are failures.

Modified:
    test-suite/trunk/TEST.nightly.Makefile

Modified: test-suite/trunk/TEST.nightly.Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/TEST.nightly.Makefile?rev=101769&r1=101768&r2=101769&view=diff
==============================================================================
--- test-suite/trunk/TEST.nightly.Makefile (original)
+++ test-suite/trunk/TEST.nightly.Makefile Sun Apr 18 23:01:05 2010
@@ -60,8 +60,8 @@
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.llc.report.txt): \
 Output/%.nightly.llc.report.txt: Output/%.exe-llc
 	@echo > $@
-	-head -n 100 Output/$*.exe-llc >> $@
 	@-if test -f Output/$*.exe-llc; then \
+	  head -n 100 Output/$*.exe-llc >> $@ \
 	  echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-llc: " >> $@;\
 	  grep "Total Execution Time" Output/$*.llc.s.info | tail -n 1 >> $@;\
@@ -76,8 +76,8 @@
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.llc-beta.report.txt): \
 Output/%.nightly.llc-beta.report.txt: Output/%.llvm.bc Output/%.exe-llc-beta
 	@echo > $@
-	-head -n 100 Output/$*.exe-llc-beta >> $@
 	@-if test -f Output/$*.exe-llc-beta; then \
+	  head -n 100 Output/$*.exe-llc-beta >> $@ \
 	  echo "TEST-PASS: llc-beta $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-llc-beta: " >> $@;\
 	  grep "Total Execution Time" Output/$*.llc-beta.s.info | tail -n 1 >> $@;\
@@ -92,8 +92,8 @@
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.opt-beta.report.txt): \
 Output/%.nightly.opt-beta.report.txt: Output/%.exe-opt-beta
 	@echo > $@
-	-head -n 100 Output/$*.exe-opt-beta >> $@
 	@-if test -f Output/$*.exe-opt-beta; then \
+	  head -n 100 Output/$*.exe-opt-beta >> $@ \
 	  echo "TEST-PASS: opt-beta $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-opt-beta: " >> $@;\
 	  grep "Total Execution Time" Output/$*.opt-beta.s.info | tail -n 1 >> $@;\
@@ -108,8 +108,8 @@
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.cbe.report.txt): \
 Output/%.nightly.cbe.report.txt: Output/%.exe-cbe
 	@echo > $@
-	-head -n 100 Output/$*.exe-cbe >> $@
 	@-if test -f Output/$*.exe-cbe; then \
+	  head -n 100 Output/$*.exe-cbe >> $@ \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-cbe-time: " >> $@;\
 	  grep "^program" Output/$*.out-cbe.time >> $@;\
@@ -122,8 +122,8 @@
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.jit.report.txt): \
 Output/%.nightly.jit.report.txt: Output/%.exe-jit
 	@echo > $@
-	-head -n 100 Output/$*.exe-jit >> $@
 	@-if test -f Output/$*.exe-jit; then \
+	  head -n 100 Output/$*.exe-jit >> $@ \
 	  echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-jit-time: " >> $@;\
 	  grep "^program" Output/$*.out-jit.time >> $@;\