mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-10-02 05:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Merge.

Browse source
This commit is contained in:
Charles-François Natali 2012-01-14 11:53:37 +01:00
commit 512d54fea2
2 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Lib/test/regrtest.py
View file

@ -33,7 +33,7 @@ Verbosity
-W/--verbose3 -- display test output on failure -W/--verbose3 -- display test output on failure
-d/--debug -- print traceback for failed tests -d/--debug -- print traceback for failed tests
-q/--quiet -- no output unless one or more tests fail -q/--quiet -- no output unless one or more tests fail
-S/--slow -- print the slowest 10 tests -o/--slow -- print the slowest 10 tests
--header -- print header with interpreter info --header -- print header with interpreter info
Selecting tests Selecting tests
@ -298,7 +298,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
support.record_original_stdout(sys.stdout) support.record_original_stdout(sys.stdout)
try: try:
opts, args = getopt.getopt(sys.argv[1:], 'hvqxsSrf:lu:t:TD:NLR:FwWM:nj:Gm:', opts, args = getopt.getopt(sys.argv[1:], 'hvqxsoSrf:lu:t:TD:NLR:FwWM:nj:Gm:',
['help', 'verbose', 'verbose2', 'verbose3', 'quiet', ['help', 'verbose', 'verbose2', 'verbose3', 'quiet',
'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks', 'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks',
'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir', 'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir',
@ -340,7 +340,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
start = a start = a
elif o in ('-s', '--single'): elif o in ('-s', '--single'):
single = True single = True
elif o in ('-S', '--slow'): elif o in ('-o', '--slow'):
print_slow = True print_slow = True
elif o in ('-r', '--randomize'): elif o in ('-r', '--randomize'):
randomize = True randomize = True

3
Misc/NEWS
View file

@ -442,6 +442,9 @@ Core and Builtins
Library Library
------- -------
- Issue #13726: Fix the ambiguous -S flag in regrtest. It is -o/--slow for slow
tests.
- Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor. - Issue #12364: Fix a hang in concurrent.futures.ProcessPoolExecutor.
The hang would occur when retrieving the result of a scheduled future after The hang would occur when retrieving the result of a scheduled future after
the executor had been shut down. the executor had been shut down.