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

[Misha Brukman]

Changes in directory llvm/test/Programs:

TEST.nightly.Makefile updated: 1.20 -> 1.21

---
Log message:

* Test correctness of LLC-compiled program, not just successful compilation
* Made LLC output status format consistent with the JIT
* Fix indentation


---
Diffs of the changes:

Index: llvm/test/Programs/TEST.nightly.Makefile
diff -u llvm/test/Programs/TEST.nightly.Makefile:1.20 llvm/test/Programs/TEST.nightly.Makefile:1.21
--- llvm/test/Programs/TEST.nightly.Makefile:1.20	Wed Aug 13 12:34:56 2003
+++ llvm/test/Programs/TEST.nightly.Makefile	Thu Aug 14 11:39:10 2003
@@ -50,17 +50,17 @@
 
 # LLC tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.llc.report.txt): \
-Output/%.nightly.llc.report.txt: Output/%.llvm.bc $(LLC)
+Output/%.nightly.llc.report.txt: Output/%.llvm.bc Output/%.exe-llc $(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 \
+	-head -n 100 Output/$*.exe-llc >> $@
+	@-if test -f Output/$*.exe-llc; then \
 	  echo "TEST-PASS: llc $(RELDIR)/$*" >> $@;\
-	  printf "TEST-RESULT-llc: " >> $@;\
-	  grep "Total Execution Time" $@.info >> $@;\
-	  echo >> $@;\
-	  printf "TEST-RESULT-llc: " >> $@;\
+	  printf "TEST-RESULT-llc-time: " >> $@;\
 	  grep "^real" $@ >> $@;\
 	  echo >> $@;\
+	  printf "TEST-RESULT-llc-comptime: " >> $@;\
+	  grep "Total Execution Time" $@.info >> $@;\
+	  echo >> $@;\
 	else  \
 	  echo "TEST-FAIL: llc $(RELDIR)/$*" >> $@;\
 	fi
@@ -73,13 +73,13 @@
 	-head -n 100 Output/$*.exe-cbe >> $@
 	@-if test -f Output/$*.exe-cbe; then \
 	  echo "TEST-PASS: cbe $(RELDIR)/$*" >> $@;\
-          echo "TEST-RESULT-cbe: YES" >> $@;\
+	  echo "TEST-RESULT-cbe: YES" >> $@;\
 	  printf "TEST-RESULT-cbe-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)cbe.time >> $@;\
 	  echo >> $@;\
-        else  \
+	else  \
 	  echo "TEST-FAIL: cbe $(RELDIR)/$*" >> $@;\
-        fi
+	fi
 
 # JIT tests
 $(PROGRAMS_TO_TEST:%=Output/%.nightly.jit.report.txt): \
@@ -87,7 +87,7 @@
 	@echo > $@
 	-head -n 100 Output/$*.exe-jit >> $@
 	@-if test -f Output/$*.exe-jit; then \
-          echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
+	  echo "TEST-PASS: jit $(RELDIR)/$*" >> $@;\
 	  printf "TEST-RESULT-jit-time: " >> $@;\
 	  grep "^real" $(INFO_PREFIX)jit.time >> $@;\
 	  echo >> $@;\