summaryrefslogtreecommitdiffstats
path: root/Lib/test/regrtest.py
diff options
context:
space:
mode:
authorChris Jerdonek <chris.jerdonek@gmail.com>2012-12-28 02:32:47 (GMT)
committerChris Jerdonek <chris.jerdonek@gmail.com>2012-12-28 02:32:47 (GMT)
commitf7cd05d7af1440464d2df62f2c7755b6dc76db99 (patch)
tree70a2d1f4e277db59c42555e6d7d30e65c1f191d2 /Lib/test/regrtest.py
parent774715cd81635c88e9432f67dac7f67964539b78 (diff)
parent28441e353cbe95e1b2e26eb08d7b1969ca26d261 (diff)
downloadcpython-f7cd05d7af1440464d2df62f2c7755b6dc76db99.zip
cpython-f7cd05d7af1440464d2df62f2c7755b6dc76db99.tar.gz
cpython-f7cd05d7af1440464d2df62f2c7755b6dc76db99.tar.bz2
Merge from 3.3: Issue #15324: Fix regrtest --fromfile, --match, --randomize.
Diffstat (limited to 'Lib/test/regrtest.py')
-rwxr-xr-xLib/test/regrtest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 4e6064c..a174a1b 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -38,7 +38,7 @@ Verbosity
Selecting tests
--r/--random -- randomize test execution order (see below)
+-r/--randomize -- randomize test execution order (see below)
--randseed -- pass a random seed to reproduce a previous random run
-f/--fromfile -- read names of tests to run from a file (see below)
-x/--exclude -- arguments are tests to *exclude*
@@ -301,12 +301,12 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
try:
opts, args = getopt.getopt(sys.argv[1:], 'hvqxsoS:rf:lu:t:TD:NLR:FdwWM:nj:Gm:',
['help', 'verbose', 'verbose2', 'verbose3', 'quiet',
- 'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks',
+ 'exclude', 'single', 'slow', 'randomize', 'fromfile=', 'findleaks',
'use=', 'threshold=', 'coverdir=', 'nocoverdir',
'runleaks', 'huntrleaks=', 'memlimit=', 'randseed=',
'multiprocess=', 'coverage', 'slaveargs=', 'forever', 'debug',
'start=', 'nowindows', 'header', 'testdir=', 'timeout=', 'wait',
- 'failfast', 'match'])
+ 'failfast', 'match='])
except getopt.error as msg:
usage(msg)