1. Don't generate redundant copy of stderr

2. Only match \ at the *end* of a line.

llvm-svn: 36007
This commit is contained in:
Reid Spencer 2007-04-14 18:51:19 +00:00
parent 2441c0ae3e
commit b7c5957e7c
1 changed files with 2 additions and 2 deletions

View File

@ -5,7 +5,7 @@ proc execOneLine { test outcome lineno line } {
if { $retval != 0 } { if { $retval != 0 } {
set code [lindex $::errorCode 0] set code [lindex $::errorCode 0]
set lineno [expr $lineno + 1] set lineno [expr $lineno + 1]
set errmsg " at RUN: line $lineno\n$::errorInfo\n$errmsg" set errmsg " at RUN: line $lineno\n$::errorInfo"
switch "$code" { switch "$code" {
CHILDSTATUS { CHILDSTATUS {
set status [lindex $::errorCode 2] set status [lindex $::errorCode 2]
@ -101,7 +101,7 @@ proc llvm-runtest { programs } {
#see if this is our run line #see if this is our run line
if {[regexp {END.[ *]$} $line match endofscript]} { if {[regexp {END.[ *]$} $line match endofscript]} {
break break
} elseif {[regexp {RUN: *([^\\]+)(\\)} $line match oneline suffix]} { } elseif {[regexp {RUN: *([^\\]+)(\\)$} $line match oneline suffix]} {
set runline "$runline$oneline " set runline "$runline$oneline "
} elseif {[regexp {RUN: *([^&]+)(&&)?} $line match oneline suffix]} { } elseif {[regexp {RUN: *([^&]+)(&&)?} $line match oneline suffix]} {
set runline "$runline$oneline" set runline "$runline$oneline"