summaryrefslogtreecommitdiffstats
path: root/test/runtest
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2010-06-07 16:24:19 (GMT)
committerSteven Knight <knight@baldmt.com>2010-06-07 16:24:19 (GMT)
commitb8e240fa4c0b4966b7bbfdf7768b43889982fc87 (patch)
treef3318e2e22f0869efe45a6796b478094eacf8dfe /test/runtest
parent309df4ac53e3c96e642db2cfa215125c15a7e6ed (diff)
downloadSCons-b8e240fa4c0b4966b7bbfdf7768b43889982fc87.zip
SCons-b8e240fa4c0b4966b7bbfdf7768b43889982fc87.tar.gz
SCons-b8e240fa4c0b4966b7bbfdf7768b43889982fc87.tar.bz2
Don't skip runtest.py tests on systems that don't have QMTest installed.
Diffstat (limited to 'test/runtest')
-rw-r--r--test/runtest/qmtest.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/test/runtest/qmtest.py b/test/runtest/qmtest.py
index 6b9c5a2..4f158c4 100644
--- a/test/runtest/qmtest.py
+++ b/test/runtest/qmtest.py
@@ -41,16 +41,17 @@ import TestRuntest
test = TestRuntest.TestRuntest()
+
+qmtest = test.where_is('qmtest')
+if not qmtest:
+ test.skip_test("Could not find 'qmtest'; skipping test(s).\n")
+
test.subdir('test')
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_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)
test.write_passing_test(test_pass_py)