diff options
| author | William Deegan <bill@baddogconsulting.com> | 2017-03-12 21:39:12 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2017-03-12 21:39:12 (GMT) |
| commit | a0484dfdd42420f93823aad868c73bd6b3565f82 (patch) | |
| tree | dc4fcd021bbeb015fb6c64b1e219fb948c0215f8 /test/option-k.py | |
| parent | 9011a84a8660e2b79b2b51bc3160f8abc9694c19 (diff) | |
| download | SCons-a0484dfdd42420f93823aad868c73bd6b3565f82.zip SCons-a0484dfdd42420f93823aad868c73bd6b3565f82.tar.gz SCons-a0484dfdd42420f93823aad868c73bd6b3565f82.tar.bz2 | |
set mode=r and not rb. py2/3
Diffstat (limited to 'test/option-k.py')
| -rw-r--r-- | test/option-k.py | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/test/option-k.py b/test/option-k.py index 5cd9be9..7a01ed3 100644 --- a/test/option-k.py +++ b/test/option-k.py @@ -55,6 +55,7 @@ sys.exit(1) # test.write(['work1', 'SConstruct'], """\ +DefaultEnvironment(tools=[]) Succeed = Builder(action = r'%(_python_)s ../succeed.py $TARGETS') Fail = Builder(action = r'%(_python_)s ../fail.py $TARGETS') env = Environment(BUILDERS = { 'Succeed' : Succeed, 'Fail' : Fail }) @@ -82,7 +83,7 @@ test.run(chdir = 'work1', test.must_not_exist(test.workpath('work1', 'aaa.1')) test.must_not_exist(test.workpath('work1', 'aaa.out')) -test.must_match(['work1', 'bbb.out'], "succeed.py: bbb.out\n") +test.must_match(['work1', 'bbb.out'], "succeed.py: bbb.out\n", mode='r') test.unlink(['work1', 'bbb.out']) @@ -93,7 +94,7 @@ test.run(chdir = 'work1', test.must_not_exist(test.workpath('work1', 'aaa.1')) test.must_not_exist(test.workpath('work1', 'aaa.out')) -test.must_match(['work1', 'bbb.out'], "succeed.py: bbb.out\n") +test.must_match(['work1', 'bbb.out'], "succeed.py: bbb.out\n", mode='r') expect = """\ scons: Reading SConscript files ... @@ -118,6 +119,7 @@ test.must_not_exist(test.workpath('work1', 'bbb.out')) # test.write(['work2', 'SConstruct'], """\ +DefaultEnvironment(tools=[]) Succeed = Builder(action = r'%(_python_)s ../succeed.py $TARGETS') Fail = Builder(action = r'%(_python_)s ../fail.py $TARGETS') env = Environment(BUILDERS = { 'Succeed' : Succeed, 'Fail' : Fail }) @@ -146,8 +148,8 @@ scons: done building targets (errors occurred during build). test.must_not_exist(['work2', 'aaa.out']) test.must_not_exist(['work2', 'bbb.out']) -test.must_match(['work2', 'ccc.out'], "succeed.py: ccc.out\n") -test.must_match(['work2', 'ddd.out'], "succeed.py: ddd.out\n") +test.must_match(['work2', 'ccc.out'], "succeed.py: ccc.out\n", mode='r') +test.must_match(['work2', 'ddd.out'], "succeed.py: ddd.out\n", mode='r') @@ -173,6 +175,7 @@ test.must_match(['work2', 'ddd.out'], "succeed.py: ddd.out\n") # test.write(['work3', 'SConstruct'], """\ +DefaultEnvironment(tools=[]) Succeed = Builder(action = r'%(_python_)s ../succeed.py $TARGETS') Fail = Builder(action = r'%(_python_)s ../fail.py $TARGETS') env = Environment(BUILDERS = { 'Succeed' : Succeed, 'Fail' : Fail }) |