From: stevenknight Date: Fri, 6 Feb 2009 19:31:50 +0000 (+0000) Subject: Fixes for use of regular expression with must_contain_all_lines(). X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=473ef82ef9b3d1f4e2e5adee0fa3fca60cd7755c;p=scons.git Fixes for use of regular expression with must_contain_all_lines(). git-svn-id: http://scons.tigris.org/svn/scons/trunk@3977 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- diff --git a/test/scons-time/run/config/subdir.py b/test/scons-time/run/config/subdir.py index 4d213183..b4638680 100644 --- a/test/scons-time/run/config/subdir.py +++ b/test/scons-time/run/config/subdir.py @@ -58,6 +58,8 @@ expect = [ 'SConstruct file directory: .*%ssubdir$' % re.escape(os.sep), ] -test.must_contain_all_lines('foo-000-0.log', content, expect, re.search) +def re_find(content, line): + return re.search(line, content) +test.must_contain_all_lines(content, expect, 'foo-000-0.log', re_find) test.pass_test() diff --git a/test/scons-time/run/option/subdir.py b/test/scons-time/run/option/subdir.py index b96d0e66..eeae750b 100644 --- a/test/scons-time/run/option/subdir.py +++ b/test/scons-time/run/option/subdir.py @@ -54,6 +54,8 @@ expect = [ content = test.read(test.workpath('foo-000-0.log'), mode='r') -test.must_contain_all_lines('foo-000-0.log', content, expect, re.search) +def re_find(content, line): + return re.search(line, content) +test.must_contain_all_lines(content, expect, 'foo-000-0.log', re_find) test.pass_test()