[llvm-commits] [hlvm] r38386 - in /hlvm/trunk/test: lib/generate.exp lib/return0.exp return0/dg.exp

[Reid Spencer]

Author: reid
Date: Sat Jul  7 19:02:53 2007
New Revision: 38386

URL: http://llvm.org/viewvc/llvm-project?rev=38386&view=rev
Log:
Enhance the return0 tester to accept a new argument that determines whether a
non-zero result is fatal or not. This permits return0 to be used for other
purposes. Fix the generate.exp to handle the result of the test correctly. Fix
the return0/dg.exp to handle the new argument.

Modified:
    hlvm/trunk/test/lib/generate.exp
    hlvm/trunk/test/lib/return0.exp
    hlvm/trunk/test/return0/dg.exp

Modified: hlvm/trunk/test/lib/generate.exp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/lib/generate.exp?rev=38386&r1=38385&r2=38386&view=diff

==============================================================================
--- hlvm/trunk/test/lib/generate.exp (original)
+++ hlvm/trunk/test/lib/generate.exp Sat Jul  7 19:02:53 2007
@@ -65,7 +65,7 @@
                 set status [lindex $::errorCode 2]
                 pass "$test: $testexe returned $status"
               } else {
-                fail "$test: $testexe return $::errorCode\n$msg"
+                fail "$test: $testexe return $status\n$msg"
               } 
             } else {
               fail "$test: $testexe return $retval\n$msg"

Modified: hlvm/trunk/test/lib/return0.exp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/lib/return0.exp?rev=38386&r1=38385&r2=38386&view=diff

==============================================================================
--- hlvm/trunk/test/lib/return0.exp (original)
+++ hlvm/trunk/test/lib/return0.exp Sat Jul  7 19:02:53 2007
@@ -20,7 +20,7 @@
 #  MA 02110-1301 USA
 # 
 #===------------------------------------------------------------------------===#
-proc hlvm-ret-zero-test { pat } {
+proc hlvm-ret-zero-test { pat forceret0 } {
   global srcdir subdir objdir tmpdir objrootdir llc gccld gxx APR_lib
   set outdir [file join $objdir $subdir]
   set compiler [file join $objrootdir tools hlvm-compiler hlvm-compiler ]
@@ -71,7 +71,11 @@
           } else {
             set retval [ catch {exec $testexe $testname } msg ]
             if {$retval != 0} {
-              fail "$test: $testexe returned $retval:\n$msg"
+              if { ! $forceret0 } {
+                pass "$test"
+              } else {
+                fail "$test: $testexe returned $retval:\n$msg"
+              }
             } else {
               pass "$test"
             }

Modified: hlvm/trunk/test/return0/dg.exp
URL: http://llvm.org/viewvc/llvm-project/hlvm/trunk/test/return0/dg.exp?rev=38386&r1=38385&r2=38386&view=diff

==============================================================================
--- hlvm/trunk/test/return0/dg.exp (original)
+++ hlvm/trunk/test/return0/dg.exp Sat Jul  7 19:02:53 2007
@@ -1,3 +1,3 @@
 load_lib return0.exp
 
-hlvm-ret-zero-test "*.hlx"
+hlvm-ret-zero-test "*.hlx" 1