runtest.py: remove --noqmtest option

2 files changed, 4 insertions, 11 deletions

diff --git a/runtest.py b/runtest.py
index e19201ccd..382f10a8d 100644
--- a/runtest.py
+++ b/runtest.py
@@ -117,6 +117,7 @@ python3incompatibilities = None
 scons = None
 scons_exec = None
 outputfile = None
+qmtest = None
 testlistfile = None
 version = ''
 print_times = None
@@ -141,7 +142,6 @@ Options:
   -k, --no-progress           Suppress count and percent progress messages.
   -l, --list                  List available tests and exit.
   -n, --no-exec               No execute, just print command lines.
-  --noqmtest                  Execute tests directly, not using QMTest.
   --nopipefiles               Doesn't use the "file pipe" workaround for subprocess.Popen()
                               for starting tests. WARNING: Only use this when too much file
                               traffic is giving you trouble AND you can be sure that none of
@@ -160,7 +160,7 @@ Options:
                                 tar-gz        .tar.gz distribution
                                 zip           .zip distribution
   --passed                    Summarize which tests passed.
-  --qmtest                    Run using the QMTest harness.
+  --qmtest                    Run using the QMTest harness (deprecated).
   -q, --quiet                 Don't print the test being executed.
   -s, --short-progress        Short progress, prints only the command line
                               and a percentage value, based on the total and
@@ -212,7 +212,7 @@ opts, args = getopt.getopt(args, "3b:def:hj:klno:P:p:qsv:Xx:t",
                             ['baseline=', 'builddir=',
                              'debug', 'external', 'file=', 'help', 'no-progress',
                              'jobs=',
-                             'list', 'no-exec', 'noqmtest', 'nopipefiles', 'output=',
+                             'list', 'no-exec', 'nopipefiles', 'output=',
                              'package=', 'passed', 'python=', 'qmtest',
                              'quiet', 'short-progress', 'time',
                              'version=', 'exec=',
@@ -250,8 +250,6 @@ for o, a in opts:
         list_only = 1
     elif o in ['-n', '--no-exec']:
         execute_tests = None
-    elif o in ['--noqmtest']:
-        qmtest = None
     elif o in ['--nopipefiles']:
         allow_pipe_files = False
     elif o in ['-o', '--output']:
@@ -344,12 +342,6 @@ else:
                     return f
         return None
 
-# See if --qmtest or --noqmtest specified
-try:
-    qmtest
-except NameError:
-    qmtest = None
-
 sp.append(builddir)
 sp.append(cwd)
 
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 908469403..6aad0eacd 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -12,6 +12,7 @@ RELEASE 2.X.X -
     - Error messages from option parser now include hints about valid choices
     - Cleaned up some Python 1.5 and pre-2.3 code, so don't expect SCons
       to run on anything less than Python 2.4 anymore
+    - runtest.py: Removed --noqmtest option - this behavior is by default.
 
   From Juan Lang:
     - Fix WiX Tool to use .wixobj rather than .wxiobj for compiler output