summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2001-09-17 04:57:00 (GMT)
committerSteven Knight <knight@baldmt.com>2001-09-17 04:57:00 (GMT)
commit3c81bb2bd0e009c0ee81570e17b0f87ad8d034ab (patch)
tree1a08c189644909cdadc489cce0eaa487e2c6f578 /etc
parente2faf9c21bc7712fcdc547b7df0f12a6b2177601 (diff)
downloadSCons-3c81bb2bd0e009c0ee81570e17b0f87ad8d034ab.zip
SCons-3c81bb2bd0e009c0ee81570e17b0f87ad8d034ab.tar.gz
SCons-3c81bb2bd0e009c0ee81570e17b0f87ad8d034ab.tar.bz2
Run setup.py on the unpacked .tar.gz for testing.
Diffstat (limited to 'etc')
-rw-r--r--etc/Conscript4
-rw-r--r--etc/TestSCons.py5
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/Conscript b/etc/Conscript
index 5c4efc5..c1a7942 100644
--- a/etc/Conscript
+++ b/etc/Conscript
@@ -4,8 +4,8 @@
# of stuff to work on SCons.
#
-Import qw( env test_dir );
+Import qw( env );
@modules = qw(TestCmd.py TestSCons.py unittest.py);
-$env->Install("#$test_dir", @modules);
+$env->Install($env->{TEST_LIB_DIR}, @modules);
diff --git a/etc/TestSCons.py b/etc/TestSCons.py
index b1eeae6..dcd462a 100644
--- a/etc/TestSCons.py
+++ b/etc/TestSCons.py
@@ -84,6 +84,11 @@ class TestSCons(TestCmd.TestCmd):
print "STDERR ============"
print self.stderr()
raise
+ if self.status:
+ print self.progam + " returned " + (self.status >> 8)
+ print "STDERR ============"
+ print self.stderr()
+ raise TestFailed
if stdout and not self.match(self.stdout(), stdout):
print "Expected STDOUT =========="
print stdout