[Python-checkins] cpython (merge default -> default): Merge.

Sat Jan 14 11:53:45 CET 2012

http://hg.python.org/cpython/rev/db661cee5baa
changeset: 74385:db661cee5baa
parent: 74384:8bcbe2dc3835
parent: 74383:6797e7458ad0
user: Charles-François Natali <neologix at free.fr>
date: Sat Jan 14 11:53:37 2012 +0100
summary:
 Merge.
files:
 Lib/test/regrtest.py | 6 +++---
 Misc/NEWS | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -33,7 +33,7 @@
 -W/--verbose3 -- display test output on failure
 -d/--debug -- print traceback for failed tests
 -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
 
 Selecting tests
@@ -298,7 +298,7 @@
 
 support.record_original_stdout(sys.stdout)
 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',
 'exclude', 'single', 'slow', 'random', 'fromfile', 'findleaks',
 'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir',
@@ -340,7 +340,7 @@
 start = a
 elif o in ('-s', '--single'):
 single = True
- elif o in ('-S', '--slow'):
+ elif o in ('-o', '--slow'):
 print_slow = True
 elif o in ('-r', '--randomize'):
 randomize = True
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -442,6 +442,9 @@
 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.
 The hang would occur when retrieving the result of a scheduled future after
 the executor had been shut down.
-- 
Repository URL: http://hg.python.org/cpython
