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

[Reid Spencer]

Changes in directory llvm/test/lib:

llvm.exp updated: 1.1 -> 1.2
---
Log message:

Add the line number where the script failed to the error output.


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

 llvm.exp |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)


Index: llvm/test/lib/llvm.exp
diff -u llvm/test/lib/llvm.exp:1.1 llvm/test/lib/llvm.exp:1.2
--- llvm/test/lib/llvm.exp:1.1	Sat Apr 14 04:39:28 2007
+++ llvm/test/lib/llvm.exp	Sat Apr 14 11:41:39 2007
@@ -4,25 +4,27 @@
   set retval [ catch { eval exec -keepnewline -- $line } errmsg ]
   if { $retval != 0 } {
     set code [lindex $::errorCode 0]
+    set lineno [expr $lineno + 1]
+    set errmsg " at RUN: line $lineno\nwhile running: $line\n$errmsg"
     switch "$code" {
       CHILDSTATUS {
         set status [lindex $::errorCode 2]
         if { $status ne 0 } {
-          set resultmsg "$test: exit($status)\nwhile running: $line\n$errmsg"
+          set resultmsg "$test: exit($status)$errmsg"
         }
       }
       CHILDKILLED {
         set signal [lindex $::errorCode 2]
-        set resultmsg "$test: signal($signal)\nwhile running: $line\n$errmsg"
+        set resultmsg "$test: signal($signal)$errmsg"
       }
       CHILDSUSP {
         set signal [lindex $::errorCode 2]
-        set resultmsg "$test: suspend($signal)\nwhile running: $line\n$errmsg"
+        set resultmsg "$test: suspend($signal)$errmsg"
       }
       POSIX {
         set posixNum [lindex $::errorCode 1]
         set posixMsg [lindex $::errorCode 2]
-        set resultmsg "$test: posix($posixNum)\n$posixMsg\nwhile running: $line\n$errmsg"
+        set resultmsg "$test: posix($posixNum,$posixMsg)$errmsg"
       }
       NONE {
       }