summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorVictor Stinner <victor.stinner@haypocalc.com>2011-04-01 13:59:59 (GMT)
committerVictor Stinner <victor.stinner@haypocalc.com>2011-04-01 13:59:59 (GMT)
commit305bff1ef5715c1a6db1e42a8b62bf8240109bb0 (patch)
tree934fe2029d115acc3dfcabc3ad9f4dd3699d7acb /Lib
parent44378d46f61f70c40a2e157bdf94150ef694f102 (diff)
downloadcpython-305bff1ef5715c1a6db1e42a8b62bf8240109bb0.zip
cpython-305bff1ef5715c1a6db1e42a8b62bf8240109bb0.tar.gz
cpython-305bff1ef5715c1a6db1e42a8b62bf8240109bb0.tar.bz2
Issue #11727: set regrtest default timeout to 15 minutes
Diffstat (limited to 'Lib')
-rwxr-xr-xLib/test/regrtest.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 8e9fe65..59f57d5 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -22,7 +22,8 @@ Options:
-h/--help -- print this text and exit
--timeout TIMEOUT
-- dump the traceback and exit if a test takes more
- than TIMEOUT seconds
+ than TIMEOUT seconds (default: 15 minutes); disable
+ the timeout if TIMEOUT is zero
Verbosity
@@ -239,7 +240,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False,
findleaks=False, use_resources=None, trace=False, coverdir='coverage',
runleaks=False, huntrleaks=False, verbose2=False, print_slow=False,
random_seed=None, use_mp=None, verbose3=False, forever=False,
- header=False, timeout=None):
+ header=False, timeout=15*60):
"""Execute a test suite.
This also parses command-line options and modifies its behavior