summaryrefslogtreecommitdiff
path: root/test/lib
diff options
context:
space:
mode:
authorReid Spencer <rspencer@reidspencer.com>2007-04-14 18:51:19 +0000
committerReid Spencer <rspencer@reidspencer.com>2007-04-14 18:51:19 +0000
commit9a03bdac5150ec32305ce05479ab6538ecb3739c (patch)
tree5ab5ce8f9bef4b4e9eb2682c297fa061e76af7cf /test/lib
parent608266b2f5060fa1f81e635775397ec2b4158bdb (diff)
downloadllvm-9a03bdac5150ec32305ce05479ab6538ecb3739c.tar.gz
llvm-9a03bdac5150ec32305ce05479ab6538ecb3739c.tar.bz2
llvm-9a03bdac5150ec32305ce05479ab6538ecb3739c.tar.xz
1. Don't generate redundant copy of stderr
2. Only match \ at the *end* of a line. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36007 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/lib')
-rw-r--r--test/lib/llvm.exp4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index dd0525bf8c..acfc911565 100644
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -5,7 +5,7 @@ proc execOneLine { test outcome lineno line } {
if { $retval != 0 } {
set code [lindex $::errorCode 0]
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" {
CHILDSTATUS {
set status [lindex $::errorCode 2]
@@ -101,7 +101,7 @@ proc llvm-runtest { programs } {
#see if this is our run line
if {[regexp {END.[ *]$} $line match endofscript]} {
break
- } elseif {[regexp {RUN: *([^\\]+)(\\)} $line match oneline suffix]} {
+ } elseif {[regexp {RUN: *([^\\]+)(\\)$} $line match oneline suffix]} {
set runline "$runline$oneline "
} elseif {[regexp {RUN: *([^&]+)(&&)?} $line match oneline suffix]} {
set runline "$runline$oneline"