summaryrefslogtreecommitdiffstats
path: root/test/runtest/noqmtest.py
diff options
context:
space:
mode:
authorGreg Noel <GregNoel@tigris.org>2009-05-08 17:13:56 (GMT)
committerGreg Noel <GregNoel@tigris.org>2009-05-08 17:13:56 (GMT)
commit9a658f09321c970e2fe736cf0b21e4b6cf7b83b2 (patch)
tree96247d8b88d68c212efa1b606cb4166103f69177 /test/runtest/noqmtest.py
parentc8099da03756462a9b2b4acfba2c72f627428141 (diff)
downloadSCons-9a658f09321c970e2fe736cf0b21e4b6cf7b83b2.zip
SCons-9a658f09321c970e2fe736cf0b21e4b6cf7b83b2.tar.gz
SCons-9a658f09321c970e2fe736cf0b21e4b6cf7b83b2.tar.bz2
Update regression tests to match changes in runtest.py
Diffstat (limited to 'test/runtest/noqmtest.py')
-rw-r--r--test/runtest/noqmtest.py16
1 files changed, 8 insertions, 8 deletions
diff --git a/test/runtest/noqmtest.py b/test/runtest/noqmtest.py
index 3980b70..2ff4f65 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