summaryrefslogtreecommitdiff
path: root/test/Execute.py
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2017-05-15 18:52:50 -0700
committerWilliam Deegan <bill@baddogconsulting.com>2017-05-15 18:52:50 -0700
commit631ed58424d4a74e2e82902ddba35c46c6d39603 (patch)
tree1bf4c20419f5aded0e8d50b6bc73d31d0ba87582 /test/Execute.py
parente444a9754ae31657b6899bc8274961148c4574c2 (diff)
downloadscons-631ed58424d4a74e2e82902ddba35c46c6d39603.tar.gz
py2/3 changed expected output since contents of exception string are different py2 to py3
Diffstat (limited to 'test/Execute.py')
-rw-r--r--test/Execute.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/test/Execute.py b/test/Execute.py
index e63cad5a..edd746ef 100644
--- a/test/Execute.py
+++ b/test/Execute.py
@@ -83,10 +83,15 @@ test.write('l.in', "l.in\n")
test.write('m.in', "m.in\n")
import sys
-if sys.platform == 'win32':
+if sys.platform == 'win32' and sys.version_info[0] == 2:
expect = r"""scons: \*\*\* Error 1
scons: \*\*\* Error 2
scons: \*\*\* nonexistent.in/\*\.\*: (The system cannot find the path specified|Das System kann den angegebenen Pfad nicht finden)"""
+elif sys.platform == 'win32' and sys.version_info[0] == 3:
+ expect = r"""scons: \*\*\* Error 1
+scons: \*\*\* Error 2
+scons: \*\*\* nonexistent.in: (The system cannot find the path specified|Das System kann den angegebenen Pfad nicht finden)"""
+
else:
expect = r"""scons: \*\*\* Error 1
scons: \*\*\* Error 2