summaryrefslogtreecommitdiff
path: root/test/option
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2009-09-12 04:57:46 +0000
committerWilliam Deegan <bill@baddogconsulting.com>2009-09-12 04:57:46 +0000
commitb4d417c6a96e17e9c57afc0aa928905708fc0d35 (patch)
tree5d8c67b411d89a299e28fcaf8797fc55a64929a0 /test/option
parente60568db84b1a3193cabb5940288753014867e10 (diff)
downloadscons-b4d417c6a96e17e9c57afc0aa928905708fc0d35.tar.gz
Add python version deprecated check to get this test to pass on python 2.3 (hopefully this doesn't break other versions)
Diffstat (limited to 'test/option')
-rw-r--r--test/option/debug-memoizer.py6
1 files changed, 3 insertions, 3 deletions
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)