Update regression tests to match changes in runtest.py

git-svn-id: http://scons.tigris.org/svn/scons/trunk@4180 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/test/runtest/fallback.py b/test/runtest/fallback.py
index ddabfbf4daa180851e130a9d20881aa702492d20..d74ba6c980f0b49f71f1df316cfe16dcdec9c715 100644 (file)
--- 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 3980b7077a4fdc5aad39df0cf8a77fb35d997790..2ff4f6579a054ceda5d06ef11bd8dd2470245e3b 100644 (file)
--- 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