From 496d5d4655ec5eaaf5f47b70a0a5e9f08a310ff3 Mon Sep 17 00:00:00 2001 From: William Deegan Date: Mon, 13 Mar 2017 23:07:10 -0400 Subject: py2/3 add mode='r' to must_match. Should fix some win32 failures --- test/AR/AR.py | 2 +- test/AR/ARFLAGS.py | 2 +- test/CC/CC.py | 6 +++--- test/CC/SHCC.py | 2 +- test/LINK/LINK.py | 2 +- test/LINK/SHLINK.py | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test/AR/AR.py b/test/AR/AR.py index 11687d9..552b827 100644 --- a/test/AR/AR.py +++ b/test/AR/AR.py @@ -95,7 +95,7 @@ test.run(arguments = 'b' + _exe, stderr=TestSCons.noisy_ar, match=TestSCons.match_re_dotall) -test.must_match('wrapper.out', 'wrapper.py\n') +test.must_match('wrapper.out', 'wrapper.py\n', mode='r') test.pass_test() diff --git a/test/AR/ARFLAGS.py b/test/AR/ARFLAGS.py index 2d90752..2aa1a14 100644 --- a/test/AR/ARFLAGS.py +++ b/test/AR/ARFLAGS.py @@ -94,7 +94,7 @@ test.run(arguments = 'b' + _exe, stderr=TestSCons.noisy_ar, match=TestSCons.match_re_dotall) -test.must_match('wrapper.out', 'wrapper.py\n') +test.must_match('wrapper.out', 'wrapper.py\n', mode='r') test.pass_test() diff --git a/test/CC/CC.py b/test/CC/CC.py index f6c2954..6363273 100644 --- a/test/CC/CC.py +++ b/test/CC/CC.py @@ -124,7 +124,7 @@ env.Program(target = 'test1', source = 'test1.c') test.run(arguments = '.', stderr = None) -test.must_match('test1' + _exe, "This is a .c file.\n") +test.must_match('test1' + _exe, "This is a .c file.\n", mode='r') if os.path.normcase('.c') == os.path.normcase('.C'): @@ -137,7 +137,7 @@ env.Program(target = 'test2', source = 'test2.C') """ % locals()) test.run(arguments = '.', stderr = None) - test.must_match('test2' + _exe, "This is a .C file.\n") + test.must_match('test2' + _exe, "This is a .C file.\n", mode='r') test.file_fixture('wrapper.py') @@ -157,7 +157,7 @@ test.up_to_date(arguments = 'foo' + _exe) test.run(arguments = 'bar' + _exe) -test.must_match('wrapper.out', "wrapper.py\n") +test.must_match('wrapper.out', "wrapper.py\n", mode='r') test.up_to_date(arguments = 'bar' + _exe) diff --git a/test/CC/SHCC.py b/test/CC/SHCC.py index beda8e4..c756219 100644 --- a/test/CC/SHCC.py +++ b/test/CC/SHCC.py @@ -75,7 +75,7 @@ test.must_not_exist(test.workpath('wrapper.out')) test.run(arguments = 'bar') -test.must_match('wrapper.out', "wrapper.py\n") +test.must_match('wrapper.out', "wrapper.py\n", mode='r') test.pass_test() diff --git a/test/LINK/LINK.py b/test/LINK/LINK.py index 533163c..6c99134 100644 --- a/test/LINK/LINK.py +++ b/test/LINK/LINK.py @@ -74,7 +74,7 @@ test.must_not_exist(test.workpath('wrapper.out')) test.run(arguments = 'bar' + _exe) -test.must_match('wrapper.out', "wrapper.py\n") +test.must_match('wrapper.out', "wrapper.py\n", mode='r') test.pass_test() diff --git a/test/LINK/SHLINK.py b/test/LINK/SHLINK.py index 9b546c7..9d406fc 100644 --- a/test/LINK/SHLINK.py +++ b/test/LINK/SHLINK.py @@ -72,7 +72,7 @@ test.must_not_exist(test.workpath('wrapper.out')) test.run(arguments = dll_ + 'bar' + _shlib) -test.must_match('wrapper.out', "wrapper.py\n") +test.must_match('wrapper.out', "wrapper.py\n", mode='r') test.pass_test() -- cgit v0.12