diff options
| author | Steven Knight <knight@baldmt.com> | 2008-09-24 15:53:30 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-09-24 15:53:30 (GMT) |
| commit | b0306e45a4af043aff96c93ecb82f1f7a17c6e37 (patch) | |
| tree | eed1eb53342ca29c2eb2bc0b333efbb998e5aaaa /test | |
| parent | 2acc329d8522dbaadece2c61744cf99019747239 (diff) | |
| download | SCons-b0306e45a4af043aff96c93ecb82f1f7a17c6e37.zip SCons-b0306e45a4af043aff96c93ecb82f1f7a17c6e37.tar.gz SCons-b0306e45a4af043aff96c93ecb82f1f7a17c6e37.tar.bz2 | |
Python 1.5 portability in test/Execute.py.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Execute.py | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/test/Execute.py b/test/Execute.py index 1ff45e8..19583ca 100644 --- a/test/Execute.py +++ b/test/Execute.py @@ -90,7 +90,17 @@ scons: *** Error 2 scons: *** nonexistent.in/*.*: The system cannot find the path specified """ else: - expect = """\ + # TODO(1.5): the underlying shutil.copytree() call doesn't + # add the nonexistent file name to the exception it throws. + # This goes away soon, so just accomodate the difference. + if sys.version[:3] == '1.5': + expect = """\ +scons: *** Error 1 +scons: *** Error 2 +scons: *** No such file or directory +""" + else: + expect = """\ scons: *** Error 1 scons: *** Error 2 scons: *** nonexistent.in: No such file or directory |