Add regrtest -w option.

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index e7601c878178975bb86b2d7ffe4d1a6159a98808..a1f237dc66cbd93c7893542d8fc491515840c33d 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -9,6 +9,7 @@ additional facilities.
 Command line options:
 
 -v: verbose    -- run tests in verbose mode with output to stdout
+-w: verbose2   -- re-run failed tests in verbose mode
 -q: quiet      -- don't print anything except if a test fails
 -g: generate   -- write the output file for a test instead of comparing it
 -x: exclude    -- arguments are tests to *exclude*
@@ -154,7 +155,7 @@ def usage(code, msg=''):
 def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
          exclude=False, single=False, randomize=False, fromfile=None,
          findleaks=False, use_resources=None, trace=False, coverdir='coverage',
-         runleaks=False, huntrleaks=False):
+         runleaks=False, huntrleaks=False, verbose2=False):
     """Execute a test suite.
 
     This also parses command-line options and modifies its behavior
@@ -179,12 +180,12 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
 
     test_support.record_original_stdout(sys.stdout)
     try:
-        opts, args = getopt.getopt(sys.argv[1:], 'hvgqxsrf:lu:t:TD:NLR:',
+        opts, args = getopt.getopt(sys.argv[1:], 'hvgqxsrf:lu:t:TD:NLR:w',
                                    ['help', 'verbose', 'quiet', 'generate',
                                     'exclude', 'single', 'random', 'fromfile',
                                     'findleaks', 'use=', 'threshold=', 'trace',
                                     'coverdir=', 'nocoverdir', 'runleaks',
-                                    'huntrleaks='
+                                    'huntrleaks=', 'verbose2',
                                     ])
     except getopt.error, msg:
         usage(2, msg)
@@ -197,6 +198,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
             usage(0)
         elif o in ('-v', '--verbose'):
             verbose += 1
+        elif o in ('-w', '--verbose2'):
+            verbose2 = True
         elif o in ('-q', '--quiet'):
             quiet = True;
             verbose = 0
@@ -398,6 +401,20 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
             print "Ask someone to teach regrtest.py about which tests are"
             print "expected to get skipped on", plat + "."
 
+    if verbose2 and bad:
+        print "Re-running failed tests in verbose mode"
+        for test in bad:
+            try:
+                test_support.verbose = 1
+                ok = runtest(test, generate, 1, quiet, testdir,
+                             huntrleaks)
+            except KeyboardInterrupt:
+                # print a newline separate from the ^C
+                print
+                break
+            except:
+                raise
+
     if single:
         alltests = findtests(testdir, stdtests, nottests)
         for i in range(len(alltests)):

diff --git a/Misc/NEWS b/Misc/NEWS
index b2c66784722bcd22f8a06cd6a8fac4c31aa2a337..48c5ae8dd5de33c9384cfe15ef9438d9b83e4709 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -440,6 +440,8 @@ Extension Modules
 Library
 -------
 
+- A regrtest option -w was added to re-run failed tests in verbose mode.
+
 - Patch #1446372: quit and exit can now be called from the interactive
   interpreter to exit.