[llvm-commits] CVS: llvm/test/lib/llvm.exp

[Reid Spencer]

Changes in directory llvm/test/lib:

llvm.exp updated: 1.7 -> 1.8
---
Log message:

Abandone the entire test case on the first error.


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

 llvm.exp |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)


Index: llvm/test/lib/llvm.exp
diff -u llvm/test/lib/llvm.exp:1.7 llvm/test/lib/llvm.exp:1.8
--- llvm/test/lib/llvm.exp:1.7	Sat Apr 14 23:57:03 2007
+++ llvm/test/lib/llvm.exp	Sun Apr 15 02:21:26 2007
@@ -45,7 +45,9 @@
   set path [file join $srcdir $subdir]
   set tmp  [file join Output $tmpFile]
 
-  set new_line $line
+  # Substitute all Tcl variables.
+  set new_line [subst $line ]
+
   #replace %prcontext with prcontext.tcl (Must replace before %p)
   regsub -all {%prcontext} $new_line $prcontext new_line
   #replace %llvmgcc with actual path to llvmgcc
@@ -159,7 +161,6 @@
       set failed 0
       for { set i 0 } { $i < $numLines } { set i [ expr $i + 1 ] } {
         regsub ^.*RUN:(.*) $lines($i) \1 theLine
-        set theLine [subst $theLine ]
         set resultmsg [execOneLine $test $PRNUMS $outcome $i $theLine ]
         if { $resultmsg != "" } {
           if { $outcome == "XFAIL" } {
@@ -171,8 +172,10 @@
           break
         }
       }
-      if { !$failed } {
-        if {$PRNUMS != ""} {
+      if { $failed } {
+        break;
+      } else {
+        if { $PRNUMS != "" } {
           set PRNUMS " for $PRNUMS"
         }
         if { $outcome == "XFAIL" } {