Merge rev 42963 from the trunk.

When the new -w option (yay! great idea) reruns a
failed test, first display the name of the test (else
it's not always clear from the output which test is
getting run).

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 4f30bbca3cb1c769bc55f8ed9536d61b897535c0..9be9bb95bbe754e80ce1ba269f71865cf1f66f34 100755 (executable)
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -392,6 +392,8 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, generate=False,
     if verbose2 and bad:
         print "Re-running failed tests in verbose mode"
         for test in bad:
+            print "Re-running test %r in verbose mode" % test
+            sys.stdout.flush()
             try:
                 test_support.verbose = 1
                 ok = runtest(test, generate, 1, quiet, testdir,