summaryrefslogtreecommitdiffstats
path: root/runtest.py
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2009-12-15 22:40:17 (GMT)
committerSteven Knight <knight@baldmt.com>2009-12-15 22:40:17 (GMT)
commit19082c6988c2905222e97271ea44ee2cba2b88e5 (patch)
tree03b3b53717a053fa35ccc85558f185a052c76dd5 /runtest.py
parent814ababbd2c0d838ebecd80d0a61b441e035cb64 (diff)
downloadSCons-19082c6988c2905222e97271ea44ee2cba2b88e5.zip
SCons-19082c6988c2905222e97271ea44ee2cba2b88e5.tar.gz
SCons-19082c6988c2905222e97271ea44ee2cba2b88e5.tar.bz2
Disable QMTest by default, leave it available when --qmtest is used.
Diffstat (limited to 'runtest.py')
-rw-r--r--runtest.py27
1 files changed, 14 insertions, 13 deletions
diff --git a/runtest.py b/runtest.py
index a2d6601..731f36f 100644
--- 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')