diff options
| author | William Deegan <bill@baddogconsulting.com> | 2018-09-21 02:35:51 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2018-09-21 02:35:51 (GMT) |
| commit | b71404ff2d256460f23c4494932af2ea61d1a271 (patch) | |
| tree | 51e6d7cf40ab76625b531498ac88d88c9a539139 /test/Execute.py | |
| parent | 3fa7141ec7b39abd76817367cbb39eccc8bd6bb0 (diff) | |
| download | SCons-b71404ff2d256460f23c4494932af2ea61d1a271.zip SCons-b71404ff2d256460f23c4494932af2ea61d1a271.tar.gz SCons-b71404ff2d256460f23c4494932af2ea61d1a271.tar.bz2 | |
Fix test/Execute.py failing on windows with python 2.7.15. It worked fine with python 2.7.14 and below. The output message changed from / to \ and broke the test.
Diffstat (limited to 'test/Execute.py')
| -rw-r--r-- | test/Execute.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/test/Execute.py b/test/Execute.py index edd746e..c40d0d0 100644 --- a/test/Execute.py +++ b/test/Execute.py @@ -27,7 +27,7 @@ __revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__" """ Test the Execute() function for executing actions directly. """ - +import sys import TestSCons _python_ = TestSCons._python_ @@ -82,11 +82,12 @@ test.write('k.in', "k.in\n") test.write('l.in', "l.in\n") test.write('m.in', "m.in\n") -import sys if sys.platform == 'win32' and sys.version_info[0] == 2: + # note that nonexistent.in will have a \ on windows with python < 2.7.15 + # and a / on >= 2.7.15 (The third line below) 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)""" +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 |