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

Fri Apr 29 00:49:51 CEST 2011

http://hg.python.org/cpython/rev/10f547214895
changeset: 69678:10f547214895
parent: 69677:1e3c6fedcf8e
parent: 69675:3d9800fcce7f
user: Antoine Pitrou <solipsis at pitrou.net>
date: Fri Apr 29 00:49:33 2011 +0200
summary:
 Merge
files:
 Lib/test/regrtest.py | 5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -24,6 +24,7 @@
 -- dump the traceback and exit if a test takes more
 than TIMEOUT seconds (default: 30 minutes); disable
 the timeout if TIMEOUT is zero
+--wait -- wait for user input, e.g., allow a debugger to be attached
 
 Verbosity
 
@@ -279,7 +280,7 @@
 'use=', 'threshold=', 'trace', 'coverdir=', 'nocoverdir',
 'runleaks', 'huntrleaks=', 'memlimit=', 'randseed=',
 'multiprocess=', 'coverage', 'slaveargs=', 'forever', 'debug',
- 'start=', 'nowindows', 'header', 'testdir=', 'timeout='])
+ 'start=', 'nowindows', 'header', 'testdir=', 'timeout=', 'wait'])
 except getopt.error as msg:
 usage(msg)
 
@@ -419,6 +420,8 @@
 "faulthandler.dump_tracebacks_later", file=sys.stderr)
 sys.exit(1)
 timeout = float(a)
+ elif o == '--wait':
+ input("Press any key to continue...")
 else:
 print(("No handler for option {}. Please report this as a bug "
 "at http://bugs.python.org.").format(o), file=sys.stderr)
-- 
Repository URL: http://hg.python.org/cpython
