diff options
| author | Steven Knight <knight@baldmt.com> | 2009-09-13 23:32:26 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2009-09-13 23:32:26 (GMT) |
| commit | 168694d14bca5aaa1a2748f03772b7c06d8786f9 (patch) | |
| tree | ce17688b57c80d93e18ba999bc2196f627b89ce1 /test/option | |
| parent | 9d068003d9800008673cf9794829ff14d402fcbc (diff) | |
| download | SCons-168694d14bca5aaa1a2748f03772b7c06d8786f9.zip SCons-168694d14bca5aaa1a2748f03772b7c06d8786f9.tar.gz SCons-168694d14bca5aaa1a2748f03772b7c06d8786f9.tar.bz2 | |
Revert r4356, the problem is in TestSCons.py, not the test script itself.
Diffstat (limited to 'test/option')
| -rw-r--r-- | test/option/debug-memoizer.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/option/debug-memoizer.py b/test/option/debug-memoizer.py index 5ad4bcf..f8e4cc3 100644 --- a/test/option/debug-memoizer.py +++ b/test/option/debug-memoizer.py @@ -81,8 +81,8 @@ expect = [ if use_metaclass: - def run_and_check(test, args, desc,stderr=None): - test.run(arguments = args,stderr=".*"+TestSCons.deprecated_python_expr) + def run_and_check(test, args, desc): + test.run(arguments = args) test.must_contain_any_line(test.stdout(), expect) else: @@ -94,7 +94,7 @@ scons: warning: memoization is not supported in this version of Python \\(%s\\) expect_no_metaclasses = expect_no_metaclasses + TestSCons.file_expr def run_and_check(test, args, desc): - test.run(arguments = args, stderr = expect_no_metaclasses+".*"+TestSCons.deprecated_python_expr) + test.run(arguments = args, stderr = expect_no_metaclasses) test.must_not_contain_any_line(test.stdout(), expect) |