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

diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index dd0525bf8ced4532a47ce96dc93630d47595ead7..acfc911565e7dd24aeb95394a28040a387387882 100644 (file)
--- 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"