diff options
| -rw-r--r-- | test/Dir/source.py | 14 | ||||
| -rw-r--r-- | test/IDL/MIDLCOM.py | 14 |
2 files changed, 14 insertions, 14 deletions
diff --git a/test/Dir/source.py b/test/Dir/source.py index 8dbee1a..c272c8f 100644 --- a/test/Dir/source.py +++ b/test/Dir/source.py @@ -43,7 +43,7 @@ test.subdir('tstamp', [ 'tstamp', 'subdir' ], test.write('SConstruct', """\ def writeTarget(target, source, env): - f=open(str(target[0]), 'wb') + f=open(str(target[0]), 'w') f.write("stuff\\n") f.close() return 0 @@ -92,12 +92,12 @@ test.write([ 'cmd-content', 'subdir', '#hash.txt' ], 'hash.txt 1\n') test.write('junk.txt', 'junk.txt\n') test.run(arguments=".", stderr=None) -test.must_match('tstamp.out', 'stuff\n') -test.must_match('content.out', 'stuff\n') -test.must_match('cmd-tstamp.out', 'stuff\n') -test.must_match('cmd-content.out', 'stuff\n') -test.must_match('cmd-tstamp-noscan.out', 'stuff\n') -test.must_match('cmd-content-noscan.out', 'stuff\n') +test.must_match('tstamp.out', 'stuff\n', mode='r') +test.must_match('content.out', 'stuff\n', mode='r') +test.must_match('cmd-tstamp.out', 'stuff\n', mode='r') +test.must_match('cmd-content.out', 'stuff\n', mode='r') +test.must_match('cmd-tstamp-noscan.out', 'stuff\n', mode='r') +test.must_match('cmd-content-noscan.out', 'stuff\n', mode='r') test.up_to_date(arguments='tstamp.out') test.up_to_date(arguments='content.out') diff --git a/test/IDL/MIDLCOM.py b/test/IDL/MIDLCOM.py index 0525592..a478da0 100644 --- a/test/IDL/MIDLCOM.py +++ b/test/IDL/MIDLCOM.py @@ -39,12 +39,12 @@ test = TestSCons.TestSCons() test.write('mymidl.py', """ import os.path import sys -out_tlb = open(sys.argv[1], 'wb') +out_tlb = open(sys.argv[1], 'w') base = os.path.splitext(sys.argv[1])[0] -out_h = open(base + '.h', 'wb') -out_c = open(base + '_i.c', 'wb') +out_h = open(base + '.h', 'w') +out_c = open(base + '_i.c', 'w') for f in sys.argv[2:]: - infile = open(f, 'rb') + infile = open(f, 'r') for l in [l for l in infile.readlines() if l != '/*midl*/\\n']: out_tlb.write(l) out_h.write(l) @@ -62,9 +62,9 @@ test.write('aaa.idl', "aaa.idl\n/*midl*/\n") test.run(arguments = '.') -test.must_match('aaa.tlb', "aaa.idl\n") -test.must_match('aaa.h', "aaa.idl\n") -test.must_match('aaa_i.c', "aaa.idl\n") +test.must_match('aaa.tlb', "aaa.idl\n", mode='r') +test.must_match('aaa.h', "aaa.idl\n", mode='r') +test.must_match('aaa_i.c', "aaa.idl\n", mode='r') test.up_to_date(options = '--debug=explain', arguments = 'aaa.tlb') |