diff options
| author | William Deegan <bill@baddogconsulting.com> | 2009-09-12 04:57:46 (GMT) |
|---|---|---|
| committer | William Deegan <bill@baddogconsulting.com> | 2009-09-12 04:57:46 (GMT) |
| commit | ca60de201a495e307c855a6e496e43d260446e9f (patch) | |
| tree | 5d8c67b411d89a299e28fcaf8797fc55a64929a0 /test/option | |
| parent | bb283129f3040d5c0f9e708a24fcff42af5f983c (diff) | |
| download | SCons-ca60de201a495e307c855a6e496e43d260446e9f.zip SCons-ca60de201a495e307c855a6e496e43d260446e9f.tar.gz SCons-ca60de201a495e307c855a6e496e43d260446e9f.tar.bz2 | |
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.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test/option/debug-memoizer.py b/test/option/debug-memoizer.py index f8e4cc3..5ad4bcf 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) |