From 19082c6988c2905222e97271ea44ee2cba2b88e5 Mon Sep 17 00:00:00 2001 From: Steven Knight Date: Tue, 15 Dec 2009 22:40:17 +0000 Subject: Disable QMTest by default, leave it available when --qmtest is used. --- runtest.py | 27 ++++++++++++++------------- 1 file 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') -- cgit v0.12