[llvm-commits] CVS: llvm/test/Programs/TEST.nightly.Makefile

[Chris Lattner]

Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.24 -> 1.25

---
Log message:

Do not remove .info files, allowing tests to be rerun successfully
Eliminate fuzzy match in the $(INFO_PREFIX) variable, use correct match instead


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.24 llvm/test/Programs/TEST.nightly.Makefile:1.25
--- llvm/test/Programs/TEST.nightly.Makefile:1.24	Fri Aug 15 11:26:16 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Sun Aug 17 23:08:47 2003
@@ -16,8 +16,6 @@
 TIMEOPT = -time-passes -stats -info-output-file=$(CURDIR)/$@.info
 EXTRA_LLI_OPTS = $(TIMEOPT)
 
-INFO_PREFIX = Output/$*.*-
-
 # Compilation tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.compile.report.txt): \
 Output/%.nightly.compile.report.txt: Output/%.llvm.bc $(LGCCAS)
@@ -39,7 +37,6 @@
 	else \
 	  echo "TEST-FAIL: compile $(RELDIR)/$*" >> $@;\
 	fi
-	-rm -f $@.info
 
 # NAT tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.nat.report.txt): \
@@ -59,12 +56,11 @@
 	  printf "TEST-RESULT-llc: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
 	  printf "TEST-RESULT-llc-time: " >> $@;\
-	  grep "^real" $(INFO_PREFIX)llc.time >> $@;\
+	  grep "^real" Output/$*.out-llc.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: llc $(RELDIR)/$*" >> $@;\
 	fi
-	-rm -f $@.info
 
 # CBE tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.cbe.report.txt): \
@@ -74,7 +70,7 @@
 	@-if test -f Output/$*.exe-cbe; then \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-cbe-time: " >> $@;\
-	  grep "^real" $(INFO_PREFIX)cbe.time >> $@;\
+	  grep "^real" Output/$*.out-cbe.time >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: cbe $(RELDIR)/$*" >> $@;\
@@ -88,18 +84,17 @@
 	@-if test -f Output/$*.exe-jit; then \
 	  echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-jit-time: " >> $@;\
-	  grep "^real" $(INFO_PREFIX)jit.time >> $@;\
+	  grep "^real" Output/$*.out-jit.time >> $@;\
 	  echo >> $@;\
 	  printf "TEST-RESULT-jit-comptime: " >> $@;\
-	  grep "Total Execution Time" $(INFO_PREFIX)jit.info >> $@;\
+	  grep "Total Execution Time" Output/$*.out-jit.info >> $@;\
 	  echo >> $@;\
 	  printf "TEST-RESULT-jit-machcode: " >> $@;\
-	  grep "bytes of machine code compiled" $(INFO_PREFIX)jit.info >> $@;\
+	  grep "bytes of machine code compiled" Output/$*.out-jit.info >> $@;\
 	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: jit $(RELDIR)/$*" >> $@;\
 	fi
-	-rm -f $(INFO_PREFIX)jit.info
 
 # Overall tests: just run subordinate tests
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \