diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-12 22:39:53 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-12 22:39:53 (GMT) |
| commit | 8bbebd78a9c00d713f3b53d5e3bbd1df28cb2e74 (patch) | |
| tree | 91f840f1c513ee1041ad3464bc29ece47b203f5d | |
| parent | fac6a93b2fef46b7f0e66caf0dc4cc98d27fa2fb (diff) | |
| download | SCons-8bbebd78a9c00d713f3b53d5e3bbd1df28cb2e74.zip SCons-8bbebd78a9c00d713f3b53d5e3bbd1df28cb2e74.tar.gz SCons-8bbebd78a9c00d713f3b53d5e3bbd1df28cb2e74.tar.bz2 | |
py2/3 fix mode=r for must_match to fix win32
| -rw-r--r-- | test/Requires/eval-order.py | 6 | ||||
| -rw-r--r-- | test/subdivide.py | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/test/Requires/eval-order.py b/test/Requires/eval-order.py index 8600221..696b5e9 100644 --- a/test/Requires/eval-order.py +++ b/test/Requires/eval-order.py @@ -53,10 +53,10 @@ test.write('prereq.in', "prereq.in 1\n") # not, we'll get an error when the build action tries to use it to # build file.out. -test.run(arguments = 'file.out') +test.run(arguments='file.out') -test.must_match('prereq.out', "prereq.in 1\n") -test.must_match('file.out', "file.in 1\n") +test.must_match('prereq.out', "prereq.in 1\n", mode='r') +test.must_match('file.out', "file.in 1\n", mode='r') test.pass_test() diff --git a/test/subdivide.py b/test/subdivide.py index 770870d..8c8eff0 100644 --- a/test/subdivide.py +++ b/test/subdivide.py @@ -80,6 +80,7 @@ test.chmod(fake_cc_py, 0o755) test.chmod(fake_link_py, 0o755) test.write('SConstruct', """\ +DefaultEnvironment(tools=[]) SConsignFile(None) env = Environment(PROGSUFFIX = '.exe', OBJSUFFIX = '.obj', @@ -91,6 +92,7 @@ env.Object('foo.c') """ % locals()) test.write(['src', 'SConstruct'], """\ +DefaultEnvironment(tools=[]) SConsignFile(None) env = Environment(PROGSUFFIX = '.exe', OBJSUFFIX = '.obj', @@ -134,7 +136,7 @@ src/sub/bar.c if os.sep == '\\': expect = expect.replace('\\', '\\\\') -test.must_match(['src', 'prog.exe'], expect) +test.must_match(['src', 'prog.exe'], expect, mode='r') test.up_to_date(chdir='src', arguments = test.workpath()) |