From: bdbaddog Date: Sat, 12 Sep 2009 04:57:46 +0000 (+0000) Subject: Add python version deprecated check to get this test to pass on python 2.3 (hopefully... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=806de91bd088bbff1319090947fe2a71cdf2e1ed;p=scons.git Add python version deprecated check to get this test to pass on python 2.3 (hopefully this doesn't break other versions) git-svn-id: http://scons.tigris.org/svn/scons/trunk@4356 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- diff --git a/test/option/debug-memoizer.py b/test/option/debug-memoizer.py index f8e4cc3d..5ad4bcf5 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): - test.run(arguments = args) + def run_and_check(test, args, desc,stderr=None): + test.run(arguments = args,stderr=".*"+TestSCons.deprecated_python_expr) 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) + test.run(arguments = args, stderr = expect_no_metaclasses+".*"+TestSCons.deprecated_python_expr) test.must_not_contain_any_line(test.stdout(), expect)