diff options
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 |