summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/Execute.py12
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