Don't skip runtest.py tests on systems that don't have QMTest installed.

2 files changed, 5 insertions, 9 deletions

diff --git a/QMTest/TestRuntest.py b/QMTest/TestRuntest.py
index 6682514..926950e 100644
--- a/QMTest/TestRuntest.py
+++ b/QMTest/TestRuntest.py
@@ -129,11 +129,6 @@ class TestRuntest(TestCommon):
 
         orig_cwd = os.getcwd()
         TestCommon.__init__(self, **kw)
-  
-        if not noqmtest:
-            qmtest = self.where_is('qmtest')
-            if not qmtest:
-                self.skip_test("Could not find 'qmtest'; skipping test(s).\n")
 
         dirs = [os.environ.get('SCONS_RUNTEST_DIR', orig_cwd)]
         
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)