diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-20 16:50:54 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-20 16:50:54 (GMT) |
| commit | 18e4b000061b0cc22d5fbb44df4e68e740d7afb8 (patch) | |
| tree | 9160b9feb418baa302cf5c9ed590cf1a66d36f2f /test/implicit | |
| parent | 2ce34914cff387ad0db3e8d3dd4347a79a058640 (diff) | |
| download | SCons-18e4b000061b0cc22d5fbb44df4e68e740d7afb8.zip SCons-18e4b000061b0cc22d5fbb44df4e68e740d7afb8.tar.gz SCons-18e4b000061b0cc22d5fbb44df4e68e740d7afb8.tar.bz2 | |
py2/3 fix win32 py27 failures. Also resolve some py3 failures
Diffstat (limited to 'test/implicit')
| -rw-r--r-- | test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py | 33 |
1 files changed, 18 insertions, 15 deletions
diff --git a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py index e2e4866..2c9fd08 100644 --- a/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py +++ b/test/implicit/IMPLICIT_COMMAND_DEPENDENCIES.py @@ -32,7 +32,10 @@ is added to targets. import TestSCons -python = TestSCons.python +# swap slashes because on py3 on win32 inside the generated build.py +# the backslashes are getting interpretted as unicode which is +# invalid. +python = TestSCons.python.replace('\\','//') _python_ = TestSCons._python_ test = TestSCons.TestSCons() @@ -98,13 +101,13 @@ test.run(arguments = '--tree=all .') expect_none = 'build.py %s file.in\nfile.in\n' -test.must_match('file.out', expect_none % 'file.out') -test.must_match('file0.out', expect_none % 'file0.out') -test.must_match('file1.out', expect_none % 'file1.out') -test.must_match('fileNone.out', expect_none % 'fileNone.out') -test.must_match('fileFalse.out', expect_none % 'fileFalse.out') -test.must_match('fileTrue.out', expect_none % 'fileTrue.out') -test.must_match('fileQuote.out', expect_none % 'fileQuote.out') +test.must_match('file.out', expect_none % 'file.out', mode='r') +test.must_match('file0.out', expect_none % 'file0.out', mode='r') +test.must_match('file1.out', expect_none % 'file1.out', mode='r') +test.must_match('fileNone.out', expect_none % 'fileNone.out', mode='r') +test.must_match('fileFalse.out', expect_none % 'fileFalse.out', mode='r') +test.must_match('fileTrue.out', expect_none % 'fileTrue.out', mode='r') +test.must_match('fileQuote.out', expect_none % 'fileQuote.out', mode='r') @@ -115,13 +118,13 @@ test.run(arguments = '--tree=all .') expect_extra = 'build.py %s file.in\nxyzzy\nfile.in\n' -test.must_match('file.out', expect_extra % 'file.out') -test.must_match('file0.out', expect_none % 'file0.out') -test.must_match('file1.out', expect_extra % 'file1.out') -test.must_match('fileNone.out', expect_none % 'fileNone.out') -test.must_match('fileFalse.out', expect_none % 'fileFalse.out') -test.must_match('fileTrue.out', expect_extra % 'fileTrue.out') -test.must_match('fileQuote.out', expect_extra % 'fileQuote.out') +test.must_match('file.out', expect_extra % 'file.out', mode='r') +test.must_match('file0.out', expect_none % 'file0.out', mode='r') +test.must_match('file1.out', expect_extra % 'file1.out', mode='r') +test.must_match('fileNone.out', expect_none % 'fileNone.out', mode='r') +test.must_match('fileFalse.out', expect_none % 'fileFalse.out', mode='r') +test.must_match('fileTrue.out', expect_extra % 'fileTrue.out', mode='r') +test.must_match('fileQuote.out', expect_extra % 'fileQuote.out', mode='r') test.pass_test() |