diff options
| author | Steven Knight <knight@baldmt.com> | 2009-02-06 19:31:50 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-02-06 19:31:50 (GMT) |
| commit | 05353a39e046ec371fc62db776bf096cca3a4e10 (patch) | |
| tree | f108f7d986abc2e120cf9a182a649dca8e6b4222 /test/scons-time | |
| parent | fad26790d5c9d6ad544b426796d6ca8cd908bb95 (diff) | |
| download | SCons-05353a39e046ec371fc62db776bf096cca3a4e10.zip SCons-05353a39e046ec371fc62db776bf096cca3a4e10.tar.gz SCons-05353a39e046ec371fc62db776bf096cca3a4e10.tar.bz2 | |
Fixes for use of regular expression with must_contain_all_lines().
Diffstat (limited to 'test/scons-time')
| -rw-r--r-- | test/scons-time/run/config/subdir.py | 4 | ||||
| -rw-r--r-- | test/scons-time/run/option/subdir.py | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/scons-time/run/config/subdir.py b/test/scons-time/run/config/subdir.py index 4d21318..b463868 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 b96d0e6..eeae750 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() |