diff options
| author | Greg Noel <GregNoel@tigris.org> | 2009-05-08 17:13:56 +0000 |
|---|---|---|
| committer | Greg Noel <GregNoel@tigris.org> | 2009-05-08 17:13:56 +0000 |
| commit | 5767d4cba7ff4c948828bd1ec6f297a5cdfac94d (patch) | |
| tree | 96247d8b88d68c212efa1b606cb4166103f69177 /test/runtest | |
| parent | 45a71ac9868993e5d02bfcc62ab376bf2c0b263b (diff) | |
| download | scons-5767d4cba7ff4c948828bd1ec6f297a5cdfac94d.tar.gz | |
Update regression tests to match changes in runtest.py
Diffstat (limited to 'test/runtest')
| -rw-r--r-- | test/runtest/fallback.py | 16 | ||||
| -rw-r--r-- | test/runtest/noqmtest.py | 16 |
2 files changed, 16 insertions, 16 deletions
diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py index ddabfbf4..d74ba6c9 100644 --- a/test/runtest/fallback.py +++ b/test/runtest/fallback.py @@ -50,13 +50,13 @@ while test.where_is('qmtest'): test.subdir('test') -test_pass_py = os.path.join('test', 'pass.py') -test_fail_py = os.path.join('test', 'fail.py') +test_fail_py = os.path.join('test', 'fail.py') test_no_result_py = os.path.join('test', 'no_result.py') +test_pass_py = os.path.join('test', 'pass.py') -workpath_pass_py = test.workpath(test_pass_py) -workpath_fail_py = test.workpath(test_fail_py) +workpath_fail_py = test.workpath(test_fail_py) workpath_no_result_py = test.workpath(test_no_result_py) +workpath_pass_py = test.workpath(test_pass_py) test.write_failing_test(test_fail_py) test.write_no_result_test(test_no_result_py) @@ -70,10 +70,10 @@ else: def escape(s): return string.replace(s, '\\', '\\\\') -expect_python = escape(expect_python) -expect_workpath_pass_py = escape(workpath_pass_py) -expect_workpath_fail_py = escape(workpath_fail_py) -expect_workpath_no_result_py = escape(workpath_no_result_py) +expect_python = escape(expect_python) +expect_workpath_fail_py = escape(test_fail_py) +expect_workpath_no_result_py = escape(test_no_result_py) +expect_workpath_pass_py = escape(test_pass_py) expect_stdout = """\ %(expect_python)s -tt %(expect_workpath_fail_py)s diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py index 3980b707..2ff4f657 100644 --- a/test/runtest/noqmtest.py +++ b/test/runtest/noqmtest.py @@ -42,13 +42,13 @@ test = TestRuntest.TestRuntest(noqmtest=1) test.subdir('test') -test_pass_py = os.path.join('test', 'pass.py') -test_fail_py = os.path.join('test', 'fail.py') +test_fail_py = os.path.join('test', 'fail.py') test_no_result_py = os.path.join('test', 'no_result.py') +test_pass_py = os.path.join('test', 'pass.py') -workpath_pass_py = test.workpath(test_pass_py) -workpath_fail_py = test.workpath(test_fail_py) +workpath_fail_py = test.workpath(test_fail_py) workpath_no_result_py = test.workpath(test_no_result_py) +workpath_pass_py = test.workpath(test_pass_py) test.write_failing_test(test_fail_py) test.write_no_result_test(test_no_result_py) @@ -62,10 +62,10 @@ else: def escape(s): return string.replace(s, '\\', '\\\\') -expect_python = escape(expect_python) -expect_workpath_pass_py = escape(workpath_pass_py) -expect_workpath_fail_py = escape(workpath_fail_py) -expect_workpath_no_result_py = escape(workpath_no_result_py) +expect_python = escape(expect_python) +expect_workpath_fail_py = escape(test_fail_py) +expect_workpath_no_result_py = escape(test_no_result_py) +expect_workpath_pass_py = escape(test_pass_py) expect_stdout = """\ %(expect_python)s -tt %(expect_workpath_fail_py)s |