diff options
author | Steven Knight <knight@baldmt.com> | 2010-01-26 16:26:26 (GMT) |
---|---|---|
committer | Steven Knight <knight@baldmt.com> | 2010-01-26 16:26:26 (GMT) |
commit | f5a80d8cf4143edd7434805a568cc0e7eeaf81c0 (patch) | |
tree | 3608231e6b538a5222c7d501cbd9ce8d8ef08c76 /test/runtest/print_time.py | |
parent | b21c0b3f84d0b064e9d2dd548e0b6d246a537afb (diff) | |
download | SCons-f5a80d8cf4143edd7434805a568cc0e7eeaf81c0.zip SCons-f5a80d8cf4143edd7434805a568cc0e7eeaf81c0.tar.gz SCons-f5a80d8cf4143edd7434805a568cc0e7eeaf81c0.tar.bz2 |
Win32 portability in runtest.py tests after disabling QMTest by default.
Diffstat (limited to 'test/runtest/print_time.py')
-rw-r--r-- | test/runtest/print_time.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/runtest/print_time.py b/test/runtest/print_time.py index 54f90fe..e068447 100644 --- a/test/runtest/print_time.py +++ b/test/runtest/print_time.py @@ -29,13 +29,13 @@ Test a combination of a passing test, failing test, and no-result test with no argument on the command line. """ -import os.path +import os import re import TestCmd import TestRuntest -python = TestRuntest.python +pythonstring = re.escape(TestRuntest.pythonstring) test_fail_py = re.escape(os.path.join('test', 'fail.py')) test_no_result_py = re.escape(os.path.join('test', 'no_result.py')) test_pass_py = re.escape(os.path.join('test', 'pass.py')) @@ -51,22 +51,22 @@ test.write_no_result_test(['test', 'no_result.py']) test.write_passing_test(['test', 'pass.py']) expect_stdout = """\ -%(python)s -tt test/fail.py +%(pythonstring)s -tt %(test_fail_py)s FAILING TEST STDOUT Test execution time: \\d+.\\d seconds -%(python)s -tt test/no_result.py +%(pythonstring)s -tt %(test_no_result_py)s NO RESULT TEST STDOUT Test execution time: \\d+.\\d seconds -%(python)s -tt test/pass.py +%(pythonstring)s -tt %(test_pass_py)s PASSING TEST STDOUT Test execution time: \\d+.\\d seconds Total execution time for all tests: \\d+.\\d seconds Failed the following test: -\ttest/fail.py +\t%(test_fail_py)s NO RESULT from the following test: -\ttest/no_result.py +\t%(test_no_result_py)s """ % locals() expect_stderr = """\ |