diff options
author | William Deegan <bill@baddogconsulting.com> | 2009-09-13 22:51:45 +0000 |
---|---|---|
committer | William Deegan <bill@baddogconsulting.com> | 2009-09-13 22:51:45 +0000 |
commit | acafa03e7121d97fc6eb1d52bbb6deda370f3b55 (patch) | |
tree | 5d8c67b411d89a299e28fcaf8797fc55a64929a0 /test/option | |
parent | 7581d6c5cd9127f885aeb48d9f1d7d64e42ee072 (diff) | |
download | scons-acafa03e7121d97fc6eb1d52bbb6deda370f3b55.tar.gz |
Remove last checkin.
Diffstat (limited to 'test/option')
-rw-r--r-- | test/option/debug-memoizer.py | 24 |
1 files changed, 11 insertions, 13 deletions
diff --git a/test/option/debug-memoizer.py b/test/option/debug-memoizer.py index 0bfc8296..5ad4bcf5 100644 --- a/test/option/debug-memoizer.py +++ b/test/option/debug-memoizer.py @@ -82,10 +82,7 @@ expect = [ if use_metaclass: def run_and_check(test, args, desc,stderr=None): - if stderr: - test.run(arguments = args,stderr=stderr) - else: - test.run(arguments = args) + test.run(arguments = args,stderr=".*"+TestSCons.deprecated_python_expr) test.must_contain_any_line(test.stdout(), expect) else: @@ -96,29 +93,30 @@ 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,stderr=None): - if stderr: - test.run(arguments = args,stderr=expect_no_metaclasses+stderr) - else: - test.run(arguments = args,stderr=expect_no_metaclasses) - #test.run(arguments = args, stderr = expect_no_metaclasses+TestSCons.deprecated_python_expr) + def run_and_check(test, args, desc): + test.run(arguments = args, stderr = expect_no_metaclasses+".*"+TestSCons.deprecated_python_expr) test.must_not_contain_any_line(test.stdout(), expect) -for (args,stderr) in [('-h --debug=memoizer',''), ('--debug=memoizer','')]: - run_and_check(test, args, "command line '%s'" % args,stderr) +for args in ['-h --debug=memoizer', '--debug=memoizer']: + run_and_check(test, args, "command line '%s'" % args) test.must_match('file.out', "file.in\n") + + test.unlink("file.out") + + os.environ['SCONSFLAGS'] = '--debug=memoizer' -run_and_check(test, '', 'SCONSFLAGS=--debug=memoizer',stderr=TestSCons.deprecated_python_expr) +run_and_check(test, '', 'SCONSFLAGS=--debug=memoizer') test.must_match('file.out', "file.in\n") + test.pass_test() # Local Variables: |