Still better error reporting in TestSCons.py.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@54 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index 41a0ef0ec8f72243620f8cfa7af469bec0d5a722..fbc53baca6b29087d5f85bfd06bb9c5937b750d2 100644 (file)
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -85,7 +85,7 @@ class TestSCons(TestCmd.TestCmd):
            print self.stderr()
            raise
        if self.status:
-           print self.progam + " returned " + (self.status >> 8)
+           print "%s returned %d" % (self.program, self.status >> 8)
            print "STDERR ============"
            print self.stderr()
            raise TestFailed
@@ -94,6 +94,10 @@ class TestSCons(TestCmd.TestCmd):
            print stdout
            print "Actual STDOUT ============"
            print self.stdout()
+           stderr = self.stderr()
+           if stderr:
+               print "STDERR ==================="
+               print stderr
            raise TestFailed
        if stderr and not self.match(self.stderr(), stderr):
            print "Expected STDERR =========="