diff options
author | Robert Managan <ramanagan@att.net> | 2012-12-18 23:09:21 (GMT) |
---|---|---|
committer | Robert Managan <ramanagan@att.net> | 2012-12-18 23:09:21 (GMT) |
commit | b91167a75ea49620ea587482df0efd30d9a9cf16 (patch) | |
tree | 5767433bfda9d36e134af9b09446db20ddd34f0b /test/Execute.py | |
parent | 5758e27903c4e584b08ad2d69fa80884894e140e (diff) | |
parent | 02cae725ed116ae6cd996fe3bf5888f7f8f61b97 (diff) | |
download | SCons-b91167a75ea49620ea587482df0efd30d9a9cf16.zip SCons-b91167a75ea49620ea587482df0efd30d9a9cf16.tar.gz SCons-b91167a75ea49620ea587482df0efd30d9a9cf16.tar.bz2 |
update to latest SCons commits
Diffstat (limited to 'test/Execute.py')
-rw-r--r-- | test/Execute.py | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/test/Execute.py b/test/Execute.py index 4caa4c4..2e53444 100644 --- a/test/Execute.py +++ b/test/Execute.py @@ -84,19 +84,17 @@ test.write('m.in', "m.in\n") import sys if sys.platform == 'win32': - expect = """\ -scons: *** Error 1 -scons: *** Error 2 -scons: *** nonexistent.in/*.*: The system cannot find the path specified -""" + 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 = """\ -scons: *** Error 1 -scons: *** Error 2 -scons: *** nonexistent.in: No such file or directory -""" + expect = r"""scons: \*\*\* Error 1 +scons: \*\*\* Error 2 +scons: \*\*\* nonexistent\.in: No such file or directory""" + +test.run(arguments = '.', stdout = None, stderr = None) -test.run(arguments = '.', stderr=expect) +test.must_contain_all_lines(test.stderr(), expect.splitlines(), find=TestSCons.search_re) test.must_match('a.out', "a.in\n") test.must_match('b.out', "b.in\n") |