summaryrefslogtreecommitdiffstats
path: root/runtest.py
diff options
context:
space:
mode:
authoranatoly techtonik <techtonik@gmail.com>2012-12-17 11:09:32 (GMT)
committeranatoly techtonik <techtonik@gmail.com>2012-12-17 11:09:32 (GMT)
commit48b372251b919b28c80d3c2a7ccf0e2eb5a1a960 (patch)
tree84e86ed7f14a6654e6cfe030bc49c8dffdca7860 /runtest.py
parentdd98bfb9c7cd87c233bb0e77484ca7c925748589 (diff)
downloadSCons-48b372251b919b28c80d3c2a7ccf0e2eb5a1a960.zip
SCons-48b372251b919b28c80d3c2a7ccf0e2eb5a1a960.tar.gz
SCons-48b372251b919b28c80d3c2a7ccf0e2eb5a1a960.tar.bz2
runtest.py: remove --noqmtest option
Diffstat (limited to 'runtest.py')
-rw-r--r--runtest.py14
1 files changed, 3 insertions, 11 deletions
diff --git a/runtest.py b/runtest.py
index e19201c..382f10a 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)