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

[Owen Anderson]

Changes in directory llvm-test:

Makefile.programs updated: 1.268 -> 1.269
TEST.nightly.Makefile updated: 1.47 -> 1.48
---
Log message:

Don't run the optimizations twice when performing a nightly build.  Just record the results the first time.


---
Diffs of the changes:  (+2 -4)

 Makefile.programs     |    2 +-
 TEST.nightly.Makefile |    4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)


Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.268 llvm-test/Makefile.programs:1.269
--- llvm-test/Makefile.programs:1.268	Wed May 30 12:49:53 2007
+++ llvm-test/Makefile.programs	Wed Jun 20 18:48:01 2007
@@ -256,7 +256,7 @@
 # standard compilation optimizations.
 $(PROGRAMS_TO_TEST:%=Output/%.linked.bc): \
 Output/%.linked.bc: Output/%.linked.rbc $(LOPT)
-	-$(LOPT) -std-compile-opts $(STATS) $(EXTRA_LOPT_OPTIONS) $< -o $@ -f
+	-$(LOPT) -std-compile-opts -time-passes -info-output-file=$(CURDIR)/$@.info $(STATS) $(EXTRA_LOPT_OPTIONS) $< -o $@ -f
 
 $(PROGRAMS_TO_TEST:%=Output/%.llvm.stripped.bc): \
 Output/%.llvm.stripped.bc: Output/%.llvm.bc $(LOPT)


Index: llvm-test/TEST.nightly.Makefile
diff -u llvm-test/TEST.nightly.Makefile:1.47 llvm-test/TEST.nightly.Makefile:1.48
--- llvm-test/TEST.nightly.Makefile:1.47	Wed Jun 20 13:06:48 2007
+++ llvm-test/TEST.nightly.Makefile	Wed Jun 20 18:48:01 2007
@@ -33,9 +33,7 @@
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.compile.report.txt): \
 Output/%.nightly.compile.report.txt: Output/%.llvm.bc $(LOPT)
 	@echo > $@
-	@echo '$(LOPT) -std-compile-opts Output/$*.linked.rbc -f -o /dev/null $(TIMEOPT) $(EXTRA_LOPT_OPTIONS)  >>$@ 2>&1'
-	@-if ($(LOPT) -std-compile-opts Output/$*.linked.rbc -f -o /dev/null $(TIMEOPT) $(EXTRA_LOPT_OPTIONS) >>$@ 2>&1)\
-	;then \
+	@-if test -f Output/$@.info; then \
 	  echo "TEST-PASS: compile $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-compile: " >> $@;\
 	  grep "Total Execution Time" $@.info >> $@;\