Revert r4356, the problem is in TestSCons.py, not the test script itself.

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4359 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/option/debug-memoizer.py b/test/option/debug-memoizer.py
index 5ad4bcf56c9ff88ffaeb6d53f048112df90f10e6..f8e4cc3d3b5de7a125ac0674ecb76c6f2a9555af 100644 (file)
--- 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)