From 0947df46065c7070346000d31d8b2d62eb5ead8b Mon Sep 17 00:00:00 2001
From: Reid Spencer <rspencer@reidspencer.com>
Date: Sun, 15 Apr 2007 07:21:26 +0000
Subject: Abandone the entire test case on the first error.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@36056 91177308-0d34-0410-b5e6-96231b3b80d8
---
test/lib/llvm.exp | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
(limited to 'test')
diff --git a/test/lib/llvm.exp b/test/lib/llvm.exp
index 160a784..4a5af2a 100644
--- a/test/lib/llvm.exp
+++ b/test/lib/llvm.exp
@@ -45,7 +45,9 @@ proc substitute { line test tmpFile } {
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 @@ proc RunLLVMTests { test_source_files } {
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 @@ proc RunLLVMTests { test_source_files } {
break
}
}
- if { !$failed } {
- if {$PRNUMS != ""} {
+ if { $failed } {
+ break;
+ } else {
+ if { $PRNUMS != "" } {
set PRNUMS " for $PRNUMS"
}
if { $outcome == "XFAIL" } {
--
cgit v1.1