diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2011-06-06 10:04:36 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2011-06-06 10:04:36 (GMT) |
| commit | 9e586c2b3521188eece23432f2a39e8f728a68af (patch) | |
| tree | fa7162bad399f6be6dbc4f56ea5ee1b3b77fadc1 | |
| parent | 8480bc65bc475a8b7737dc8d23131325cd9ca02f (diff) | |
| download | cpython-9e586c2b3521188eece23432f2a39e8f728a68af.zip cpython-9e586c2b3521188eece23432f2a39e8f728a68af.tar.gz cpython-9e586c2b3521188eece23432f2a39e8f728a68af.tar.bz2 | |
Issue #12250: modify "make buildbottest" command line instead of TESTOPTS
Add TESTTIMEOUT variable (default: 3600 seconds). Use TESTTIMEOUT=0 to disable
the timeout.
***
fix
| -rwxr-xr-x | Lib/test/regrtest.py | 6 | ||||
| -rw-r--r-- | Makefile.pre.in | 5 |
2 files changed, 6 insertions, 5 deletions
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py index c83d7e1..529734a 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; disabled if TIMEOUT is negative + or equals to zero --wait -- wait for user input, e.g., allow a debugger to be attached Verbosity @@ -420,8 +421,7 @@ def main(tests=None, testdir=None, verbose=0, quiet=False, sys.exit(1) timeout = float(a) if timeout <= 0: - print("The timeout must be greater than 0", file=sys.stderr) - sys.exit(1) + timeout = None elif o == '--wait': input("Press any key to continue...") else: diff --git a/Makefile.pre.in b/Makefile.pre.in index cd5a0f6..07486fd 100644 --- a/Makefile.pre.in +++ b/Makefile.pre.in @@ -755,9 +755,10 @@ $(LIBRARY_OBJS) $(MODOBJS) Modules/python.o: $(PYTHON_HEADERS) # generated bytecode. This is sometimes a very shy bug needing a lot of # sample data. -TESTOPTS= -l --timeout=3600 $(EXTRATESTOPTS) +TESTOPTS= -l $(EXTRATESTOPTS) TESTPROG= $(srcdir)/Lib/test/regrtest.py TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) -Wd -E -bb $(TESTPYTHONOPTS) +TESTTIMEOUT= 3600 test: all platform -find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f -$(TESTPYTHON) $(TESTPROG) $(TESTOPTS) @@ -789,7 +790,7 @@ buildbottest: all platform -@if which pybuildbot.identify >/dev/null 2>&1; then \ pybuildbot.identify "CC='$(CC)'" "CXX='$(CXX)'"; \ fi - $(TESTPYTHON) $(TESTPROG) -uall -rwW $(TESTOPTS) + $(TESTPYTHON) $(TESTPROG) -uall -rwW --timeout=$(TESTTIMEOUT) $(TESTOPTS) QUICKTESTOPTS= $(TESTOPTS) -x test_subprocess test_io test_lib2to3 \ test_multibytecodec test_urllib2_localnet test_itertools \ |