From 168694d14bca5aaa1a2748f03772b7c06d8786f9 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Sun, 13 Sep 2009 23:32:26 +0000 Subject: Revert r4356, the problem is in TestSCons.py, not the test script itself. --- test/option/debug-memoizer.py | 6 +++--- 1 file 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) -- cgit v0.12