[llvm-commits] [llvm] r48769 - in /llvm/branches/ggreif/parallelized-test: Makefile lib/llvm.exp

[Gabor Greif]

Author: ggreif
Date: Tue Mar 25 07:06:00 2008
New Revision: 48769

URL: http://llvm.org/viewvc/llvm-project?rev=48769&view=rev
Log:
improved reporting of failures

Modified:
    llvm/branches/ggreif/parallelized-test/Makefile
    llvm/branches/ggreif/parallelized-test/lib/llvm.exp

Modified: llvm/branches/ggreif/parallelized-test/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/parallelized-test/Makefile?rev=48769&r1=48768&r2=48769&view=diff

==============================================================================
--- llvm/branches/ggreif/parallelized-test/Makefile (original)
+++ llvm/branches/ggreif/parallelized-test/Makefile Tue Mar 25 07:06:00 2008
@@ -49,9 +49,16 @@
 endif
 
 ifneq ($(RUNTEST),)
+
+ifdef VERBOSE
+DONE = true
+else
+DONE = echo
+endif
+
 %.makefile.out: %.makefile
 	@ $(MAKE) --always-make -C $(dir $<) -f $(notdir $<) $(notdir $@)
-#	cat $@
+	@ $(DONE)
 
 report:: $(addsuffix .out, $(shell find $(TESTDIRS) -name Test.makefile))
 	@ cat $^

Modified: llvm/branches/ggreif/parallelized-test/lib/llvm.exp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/ggreif/parallelized-test/lib/llvm.exp?rev=48769&r1=48768&r2=48769&view=diff

==============================================================================
--- llvm/branches/ggreif/parallelized-test/lib/llvm.exp (original)
+++ llvm/branches/ggreif/parallelized-test/lib/llvm.exp Tue Mar 25 07:06:00 2008
@@ -114,21 +114,32 @@
   puts $makeFileId ""
   puts $makeFileId "SUBDIR = $subdir"
   puts $makeFileId ""
+  puts $makeFileId "ifdef VERBOSE"
+  puts $makeFileId "PROGRESS = echo \$<"
+  puts $makeFileId "REPORTFAIL = cat \$@"
+  puts $makeFileId "DONE = true"
+  puts $makeFileId "else"
+  puts $makeFileId "PROGRESS = printf '.'"
+  puts $makeFileId "REPORTFAIL = (echo; echo '----' \$< 'failed ----')"
+  puts $makeFileId "DONE = true"
+  puts $makeFileId "endif"
+  puts $makeFileId ""
+  puts $makeFileId ""
   puts $makeFileId "%.testresults: [file join $path %]"
-  puts $makeFileId "\t@ printf '.'"
+  puts $makeFileId "\t@ \$(PROGRESS)"
   puts $makeFileId "\t@ (echo source \$(LLVM_OBJ_ROOT)/test/site.exp; \\"
   puts $makeFileId "\t   echo source \$(LLVM_SRC_ROOT)/test/lib/llvm.exp; \\"
-  puts $makeFileId "\t   echo proc fail { msg } { puts '\"FAIL: \$\$msg\"' }; \\"
+  puts $makeFileId "\t   echo proc fail { msg } { puts '\"FAIL: \$\$msg\"' '; exit 1' }; \\"
   puts $makeFileId "\t   echo proc xfail { msg } { puts '\"XFAIL: \$\$msg\"' }; \\"
   puts $makeFileId "\t   echo proc pass { msg } { puts '\"PASS: \$\$msg\"' }; \\"
-  puts $makeFileId "\t   echo proc xpass { msg } { puts '\"XPASS: \$\$msg\"' }; \\"
+  puts $makeFileId "\t   echo proc xpass { msg } { puts '\"XPASS: \$\$msg\"' '; exit 1' }; \\"
   puts $makeFileId "\t   echo proc verbose { msg level } { puts '\"\$\$msg\"' }; \\"
   puts $makeFileId "\t   echo set subdir \$(SUBDIR); \\"
-
   puts $makeFileId "\t   echo run_one_test \$<) | \\"
   puts $makeFileId "\t  (ulimit -t 600; \\"
   puts $makeFileId "\t   ulimit -d 512000; \\"
-  puts $makeFileId "\t   PATH=\"\$(LLVMToolDir):\$(LLVM_SRC_ROOT)/test/Scripts:\$(PATH)\" \$(TCLSH)) > \$@"
+  puts $makeFileId "\t   PATH=\"\$(LLVMToolDir):\$(LLVM_SRC_ROOT)/test/Scripts:\$(PATH)\" \$(TCLSH)) > \$@ || \$(REPORTFAIL)"
+#  puts $makeFileId "\t@ \$(DONE)"
   puts $makeFileId ""
   puts $makeFileId ""
   puts $makeFileId "TESTS = \\"
@@ -139,9 +150,9 @@
 
   puts $makeFileId ""
   puts $makeFileId "Test.makefile.out: \$(TESTS)"
-  puts $makeFileId "\t@ printf '\\n---- testing $subdir ---\\n'"
+#  puts $makeFileId "\t@ printf '\\n---- testing $subdir ---\\n'"
   puts $makeFileId "\t@ cat \$(TESTS) > \$@"
-  puts $makeFileId "\t@ touch \$@"
+#  puts $makeFileId "\t@ touch \$@"
   puts $makeFileId ""
 
   close $makeFileId