mirror of https://github.com/python/cpython
Merge from 3.3: Issue #15324: Fix regrtest --fromfile, --match, --randomize.
This commit is contained in:
commit
f7cd05d7af
|
@ -38,7 +38,7 @@ Verbosity
|
||||||
|
|
||||||
Selecting tests
|
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
|
--randseed -- pass a random seed to reproduce a previous random run
|
||||||
-f/--fromfile -- read names of tests to run from a file (see below)
|
-f/--fromfile -- read names of tests to run from a file (see below)
|
||||||
-x/--exclude -- arguments are tests to *exclude*
|
-x/--exclude -- arguments are tests to *exclude*
|
||||||
|
@ -301,12 +301,12 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
|
||||||
try:
|
try:
|
||||||
opts, args = getopt.getopt(sys.argv[1:], 'hvqxsoS:rf:lu:t:TD:NLR:FdwWM:nj:Gm:',
|
opts, args = getopt.getopt(sys.argv[1:], 'hvqxsoS:rf:lu:t:TD:NLR:FdwWM:nj:Gm:',
|
||||||
['help', 'verbose', 'verbose2', 'verbose3', 'quiet',
|
['help', 'verbose', 'verbose2', 'verbose3', 'quiet',
|
||||||
'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks',
|
'exclude', 'single', 'slow', 'randomize', 'fromfile=', 'findleaks',
|
||||||
'use=', 'threshold=', 'coverdir=', 'nocoverdir',
|
'use=', 'threshold=', 'coverdir=', 'nocoverdir',
|
||||||
'runleaks', 'huntrleaks=', 'memlimit=', 'randseed=',
|
'runleaks', 'huntrleaks=', 'memlimit=', 'randseed=',
|
||||||
'multiprocess=', 'coverage', 'slaveargs=', 'forever', 'debug',
|
'multiprocess=', 'coverage', 'slaveargs=', 'forever', 'debug',
|
||||||
'start=', 'nowindows', 'header', 'testdir=', 'timeout=', 'wait',
|
'start=', 'nowindows', 'header', 'testdir=', 'timeout=', 'wait',
|
||||||
'failfast', 'match'])
|
'failfast', 'match='])
|
||||||
except getopt.error as msg:
|
except getopt.error as msg:
|
||||||
usage(msg)
|
usage(msg)
|
||||||
|
|
||||||
|
|
|
@ -534,6 +534,9 @@ Tests
|
||||||
- Issue #10646: Tests rearranged for os.samefile/samestat to check for not
|
- Issue #10646: Tests rearranged for os.samefile/samestat to check for not
|
||||||
just symlinks but also hard links.
|
just symlinks but also hard links.
|
||||||
|
|
||||||
|
- Issue #15324: Fix regrtest parsing of --fromfile, --match, and --randomize
|
||||||
|
options.
|
||||||
|
|
||||||
- Issue #16664: Add regression tests for glob's behaviour concerning entries
|
- Issue #16664: Add regression tests for glob's behaviour concerning entries
|
||||||
starting with a ".". Patch by Sebastian Kreft.
|
starting with a ".". Patch by Sebastian Kreft.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue