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

[John Criswell]

Changes in directory llvm/test/Programs:

Makefile.programs updated: 1.60 -> 1.60.2.1
TEST.nightly.Makefile updated: 1.15 -> 1.15.2.1

---
Log message:

Merged with mainline on Thursday, June 26, 2003.


---
Diffs of the changes:

Index: llvm/test/Programs/Makefile.programs
diff -u llvm/test/Programs/Makefile.programs:1.60 llvm/test/Programs/Makefile.programs:1.60.2.1
--- llvm/test/Programs/Makefile.programs:1.60	Sun Jun 22 15:21:29 2003
+++ llvm/test/Programs/Makefile.programs	Thu Jun 26 16:35:37 2003
@@ -176,10 +176,10 @@
 # Link the program to the libraries it uses, then perform postlink
 # optimization...
 $(PROGRAMS_TO_TEST:%=Output/%.llvm.bc): \
-Output/%.llvm.bc: Output/%.linked.bc
+Output/%.llvm.bc: Output/%.linked.bc $(LGCCLDPROG)
 	$(LGCCLD) $(STATS) $< -lgcc -lc $(LIBS) crtend.o -o Output/$*.llvm
 $(PROGRAMS_TO_TEST:%=Output/%.llvm): \
-Output/%.llvm: Output/%.linked.bc
+Output/%.llvm: Output/%.linked.bc $(LGCCLDPROG)
 	$(LGCCLD) $(STATS) $< -lgcc -lc $(LIBS) crtend.o -o Output/$*.llvm
 
 # Rule to get the tracing version of the llvm.bc file for tracing:


Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.15 llvm/test/Programs/TEST.nightly.Makefile:1.15.2.1
--- llvm/test/Programs/TEST.nightly.Makefile:1.15	Sat Jun 21 21:38:29 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Thu Jun 26 16:35:37 2003
@@ -21,8 +21,9 @@
 # Compilation tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.compile.report.txt): \
 Output/%.nightly.compile.report.txt: Output/%.llvm.bc $(LGCCAS)
-	@echo '$(LGCCAS) Output/$*.linked.rll -o /dev/null $(TIMEOPT) > $@ 2>&1'
-	@if ($(LGCCAS) Output/$*.linked.rll -o /dev/null $(TIMEOPT) > $@ 2>&1)\
+	@echo > $@
+	@echo '$(LGCCAS) Output/$*.linked.rll -o/dev/null $(TIMEOPT) >> $@ 2>&1'
+	@-if ($(LGCCAS) Output/$*.linked.rll -o /dev/null $(TIMEOPT) >> $@ 2>&1)\
 	;then \
 	  echo "TEST-PASS: compile $(RELDIR)/$*" >> $@;\
 	  echo -n "TEST-RESULT-compile: " >> $@;\
@@ -42,14 +43,16 @@
 # NAT tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.nat.report.txt): \
 Output/%.nightly.nat.report.txt: Output/%.out-nat
+	@echo > $@
 	echo -n "TEST-RESULT-nat-time: " >> $@
 	-grep "^real" Output/$*.out-nat.time >> $@
 
 # LLC tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.llc.report.txt): \
 Output/%.nightly.llc.report.txt: Output/%.llvm.bc $(LLC)
+	@echo > $@
 	@echo 'time -p $(LLC) -f $(TIMEOPT) $< -o /dev/null) > $@ 2>&1'
-	@if (time -p $(LLC) -f $(TIMEOPT) $< -o /dev/null) > $@ 2>&1; then \
+	@-if (time -p $(LLC) -f $(TIMEOPT) $< -o /dev/null) >> $@ 2>&1; then \
 	  echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
 	  echo -n "TEST-RESULT-llc: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\
@@ -65,8 +68,9 @@
 # CBE tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.cbe.report.txt): \
 Output/%.nightly.cbe.report.txt: Output/%.llvm.bc Output/%.exe-cbe $(LDIS)
-	-head -n 100 Output/$*.exe-cbe > $@
-	@if test -f Output/$*.exe-cbe; then \
+	@echo > $@
+	-head -n 100 Output/$*.exe-cbe >> $@
+	@-if test -f Output/$*.exe-cbe; then \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
           echo "TEST-RESULT-cbe: YES" >> $@;\
 	  echo -n "TEST-RESULT-cbe-time: " >> $@;\
@@ -79,8 +83,9 @@
 # JIT tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.jit.report.txt): \
 Output/%.nightly.jit.report.txt: Output/%.llvm.bc Output/%.exe-jit $(LLI)
-	-head -n 100 Output/$*.exe-jit > $@
-	@if test -f Output/$*.exe-jit; then \
+	@echo > $@
+	-head -n 100 Output/$*.exe-jit >> $@
+	@-if test -f Output/$*.exe-jit; then \
           echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
 	  echo -n "TEST-RESULT-jit-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)jit.time >> $@;\
@@ -99,7 +104,7 @@
 # Overall tests: just run subordinate tests
 $(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
 Output/%.$(TEST).report.txt: $(addprefix Output/%.nightly., $(REPORTS_SUFFIX))
-	cat $(addprefix Output/$*.nightly., $(REPORTS_SUFFIX)) > $@
+	-cat $(addprefix Output/$*.nightly., $(REPORTS_SUFFIX)) > $@
 
 
 
@@ -108,6 +113,6 @@
 	@echo "---------------------------------------------------------------"
 	@echo ">>> ========= '$(RELDIR)/$*' Program"
 	@echo "---------------------------------------------------------------"
-	@cat $<
+	@-cat $<
 
 REPORT_DEPENDENCIES := $(LDIS) $(LLI) $(LLC)