From: Reid Spencer <rspencer@reidspencer.com>
Date: Thu, 18 May 2006 19:42:16 +0000 (+0000)
Subject: Improve error output. Use the third parameter of the "catch" command to
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8b437e05b5918e81ef5b057e3ce9982e1dd0e392;p=oota-llvm.git

Improve error output. Use the third parameter of the "catch" command to
capture the error output from the exec option. This generally will capture
the stderr messages generated by the tools. This information is then
printed if the test fails. This helps to recognize more quickly what the
error was. Otherwise, this information is lost.


git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@28385 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/test/lib/llvm-dg.exp b/test/lib/llvm-dg.exp
index 918421b865c..07dffae29c1 100644
--- a/test/lib/llvm-dg.exp
+++ b/test/lib/llvm-dg.exp
@@ -93,7 +93,7 @@ proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx
 	} else {
 
 	    #run script and catch errors
-	    set retval [ catch {exec /bin/sh $script >& $output} ]
+	    set retval [ catch {exec /bin/sh $script >& $output} errmsg ]
 	    
 	    if { $retval == 1 } {
 		#Get output
@@ -105,10 +105,10 @@ proc llvm-runtest { programs objdir srcdir subdir target_triplet llvmgcc llvmgxx
 		switch $outcome {
 		    PASS {
 			file delete $output
-			fail "$test: \n$result"
+			fail "$test: \n$errmsg\n$result"
 		    }
 		    XFAIL {
-			xfail "$test: \n$result"
+			xfail "$test: \n$errmsg\n$result"
 		    }
 		    default {
 			file delete $output