diff options
| author | Steven Knight <knight@baldmt.com> | 2005-08-17 19:00:39 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-08-17 19:00:39 (GMT) |
| commit | d8075b1a39a6d29bf2724e02a7b27dc35f794b70 (patch) | |
| tree | db3f38fb056dd425a3c21fa50b374724c950c692 /etc/TestCommon.py | |
| parent | c5eb97dd2c58dc4b93bbe6682631d57febdd96bc (diff) | |
| download | SCons-d8075b1a39a6d29bf2724e02a7b27dc35f794b70.zip SCons-d8075b1a39a6d29bf2724e02a7b27dc35f794b70.tar.gz SCons-d8075b1a39a6d29bf2724e02a7b27dc35f794b70.tar.bz2 | |
Update test infrastructure and ae2cvs utility to latest. Fix runtest.py's swallowing of interrupts. Update various tests.
Diffstat (limited to 'etc/TestCommon.py')
| -rw-r--r-- | etc/TestCommon.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/etc/TestCommon.py b/etc/TestCommon.py index ae57f0c..af3c8a8 100644 --- a/etc/TestCommon.py +++ b/etc/TestCommon.py @@ -80,8 +80,8 @@ The TestCommon module also provides the following variables # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. __author__ = "Steven Knight <knight at baldmt dot com>" -__revision__ = "TestCommon.py 0.13.D001 2004/11/20 08:30:40 knight" -__version__ = "0.13" +__revision__ = "TestCommon.py 0.14.D001 2005/08/15 23:02:35 knight" +__version__ = "0.14" import os import os.path @@ -262,6 +262,8 @@ class TestCommon(TestCmd): file_contents = self.read(file, mode) try: self.fail_test(not self.match(file_contents, expect)) + except KeyboardInterrupt: + raise except: print "Unexpected contents of `%s'" % file print "EXPECTED contents ======" @@ -338,6 +340,8 @@ class TestCommon(TestCmd): match = self.match try: apply(TestCmd.run, [self], kw) + except KeyboardInterrupt: + raise except: print "STDOUT ============" print self.stdout() |