diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-14 03:24:15 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-14 03:24:15 (GMT) |
| commit | 2da21594f9468283525c27992eb8565d3473841b (patch) | |
| tree | 96f6919e6a664a4268777ca6d9b1ebdcf34396da /test/Install | |
| parent | 496d5d4655ec5eaaf5f47b70a0a5e9f08a310ff3 (diff) | |
| download | SCons-2da21594f9468283525c27992eb8565d3473841b.zip SCons-2da21594f9468283525c27992eb8565d3473841b.tar.gz SCons-2da21594f9468283525c27992eb8565d3473841b.tar.bz2 | |
py2/3 add mode=r to must_match to fix win32 py27,py3
Diffstat (limited to 'test/Install')
| -rw-r--r-- | test/Install/Install.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/test/Install/Install.py b/test/Install/Install.py index d039d78..72a7545 100644 --- a/test/Install/Install.py +++ b/test/Install/Install.py @@ -96,17 +96,17 @@ test.write(f6_txt, "f6.txt\n") test.run(chdir = 'work', arguments = '.') -test.must_match(f1_out, "f1.in\n") -test.must_match(f2_out, "f2.in\n") -test.must_match(f3_out, "f3.in\n") -test.must_match(f4_out, "sub/f4.in\n") -test.must_match(['work', 'f5.txt'], "f5.txt\n") -test.must_match(['work', 'export', 'f5.txt'], "f5.txt\n") -test.must_match(['work', 'f6.txt'], "f6.txt\n") -test.must_match(['work', 'export', 'f6.txt'], "f6.txt\n") - -test.must_match(['work', 'my_install.out'], os.path.join('export', 'f3.out')) -test.must_match(['work', 'export', 'f1.in'], "f1.in\n") +test.must_match(f1_out, "f1.in\n", mode='r') +test.must_match(f2_out, "f2.in\n", mode='r') +test.must_match(f3_out, "f3.in\n", mode='r') +test.must_match(f4_out, "sub/f4.in\n", mode='r') +test.must_match(['work', 'f5.txt'], "f5.txt\n", mode='r') +test.must_match(['work', 'export', 'f5.txt'], "f5.txt\n", mode='r') +test.must_match(['work', 'f6.txt'], "f6.txt\n", mode='r') +test.must_match(['work', 'export', 'f6.txt'], "f6.txt\n", mode='r') + +test.must_match(['work', 'my_install.out'], os.path.join('export', 'f3.out'), mode='r') +test.must_match(['work', 'export', 'f1.in'], "f1.in\n", mode='r') # make sure the programs didn't get rebuilt, because nothing changed: oldtime1 = os.path.getmtime(f1_out) @@ -123,7 +123,7 @@ test.fail_test(oldtime2 != os.path.getmtime(f2_out)) # Verify that we didn't link to the Installed file. open(f2_out, 'w').write("xyzzy\n") -test.must_match(['work', 'f2.out'], "f2.in\n") +test.must_match(['work', 'f2.out'], "f2.in\n", mode='r') # Verify that scons prints an error message # if a target can not be unlinked before building it: |