bpo-30673: test.bat: add -t option (timeout) (#2211) (#2226)

(cherry picked from commit 258bfc462b1e58689b43f662a10e44ece3a10bef)

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index a2c47839deadabe96b0bb68dabbde8333e00a8ba..2b94a000b857ca52bcf8f35b70cfc57804db7300 100644 (file)
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,11 +1,19 @@
 @echo off
-rem Used by the buildbot "test" step.
+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
+
 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
@@ -13,7 +21,8 @@ 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=3600 %regrtest_args%
+call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --timeout=%timeout% %regrtest_args%