From f50a3b1e7a74f3132d6b5e1afc793ace6de7e631 Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 16 Jun 2017 14:38:50 +0200 Subject: Revert "bpo-30673: test.bat: add -t option (timeout) (#2211) (#2226)" (#2247) This reverts commit ab4ea09604ea7754a80e4fc36280f5772bf4a8b2. --- Tools/buildbot/test.bat | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat index 2b94a00..a2c4783 100644 --- a/Tools/buildbot/test.bat +++ b/Tools/buildbot/test.bat @@ -1,19 +1,11 @@ @echo off -rem Script to run the Python test suite used by the "test" step -rem of Windows buildbot slaves. -rem -rem See PCbuild/rt.bat for options, extra options: -rem -t TIMEOUT: set a timeout in seconds - +rem Used by the buildbot "test" step. setlocal set here=%~dp0 set rt_opts=-q -d set regrtest_args= -rem Use a timeout of 60 minutes per test file by default -set timeout=3600 - :CheckOpts if "%1"=="-x64" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts if "%1"=="-d" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts @@ -21,8 +13,7 @@ if "%1"=="-O" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts if "%1"=="-q" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts if "%1"=="+d" (set rt_opts=%rt_opts:-d=%) & shift & goto CheckOpts if "%1"=="+q" (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts -if "%1"=="-t" (set timeout=%2) & shift & shift & goto CheckOpts if NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts echo on -call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --timeout=%timeout% %regrtest_args% +call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --timeout=3600 %regrtest_args% -- cgit v0.12