Disable QMTest by default, leave it available when --qmtest is used.

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

diff --git a/runtest.py b/runtest.py
index a2d66010cf9b0a34a5a47ccc0404671d696d7e0f..731f36f27b32564a1909ada69801b69a53d8b544 100644 (file)
--- a/runtest.py
+++ b/runtest.py
@@ -272,20 +272,21 @@ else:
 try:
     qmtest
 except NameError:
-    # Neither specified; find it in path.
     qmtest = None
-    for q in ['qmtest', 'qmtest.py']:
-        path = whereis(q)
-        if path:
-            # The name was found on $PATH; just execute the found name so
-            # we don't have to worry about paths containing white space.
-            qmtest = q
-            break
-    if not qmtest:
-        msg = ('Warning:  found neither qmtest nor qmtest.py on $PATH;\n' +
-               '\tassuming --noqmtest option.\n')
-        sys.stderr.write(msg)
-        sys.stderr.flush()
+    # Old code for using QMTest by default if it's installed.
+    # We now default to not using QMTest unless explicitly asked for.
+    #for q in ['qmtest', 'qmtest.py']:
+    #    path = whereis(q)
+    #    if path:
+    #        # The name was found on $PATH; just execute the found name so
+    #        # we don't have to worry about paths containing white space.
+    #        qmtest = q
+    #        break
+    #if not qmtest:
+    #    msg = ('Warning:  found neither qmtest nor qmtest.py on $PATH;\n' +
+    #           '\tassuming --noqmtest option.\n')
+    #    sys.stderr.write(msg)
+    #    sys.stderr.flush()
 
 aegis = whereis('aegis')