Allow PCbuild\rt.bat to accept unlimited arguments for regrtest.

zware · zware · commit 7ab6cb44e46c · 2015-09-03T23:37:18.000-05:00
This makes it possible to pass more than 7 tests by name through
Tools\buildbot\test.bat
diff --git a/Misc/NEWS b/Misc/NEWS
@@ -180,6 +180,9 @@ Tests
   a test run is no longer marked as a failure if all tests succeed when
   re-run.
 
+- PCbuild\rt.bat now accepts an unlimited number of arguments to pass along
+  to regrtest.py.  Previously there was a limit of 9.
+
 
 What's New in Python 2.7.10?
 ============================
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
@@ -32,15 +32,17 @@ set prefix=%pcbuild%
 set suffix=
 set qmode=
 set dashO=
+set regrtestargs=
 
 :CheckOpts
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts
 if "%1"=="-q" (set qmode=yes)    & shift & goto CheckOpts
 if "%1"=="-d" (set suffix=_d)    & shift & goto CheckOpts
 if "%1"=="-x64" (set prefix=%pcbuild%amd64\) & shift & goto CheckOpts
+if NOT "%1"=="" (set regrtestargs=%regrtestargs% %1) & shift & goto CheckOpts
 
-set exe=%prefix%\python%suffix%
-set cmd="%exe%" %dashO% -Wd -3 -E -tt "%pcbuild%..\Lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9
+set exe=%prefix%python%suffix%
+set cmd="%exe%" %dashO% -Wd -3 -E -tt "%pcbuild%..\Lib\test\regrtest.py" %regrtestargs%
 if defined qmode goto Qmode
 
 echo Deleting .pyc/.pyo files ...
diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
@@ -1,15 +1,19 @@
-@rem Used by the buildbot "test" step.
-@setlocal
+@echo off
+rem Used by the buildbot "test" step.
+setlocal
 
-@set here=%~dp0
-@set rt_opts=-q -d
+set here=%~dp0
+set rt_opts=-q -d
+set regrtest_args=
 
 :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
-@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"=="-x64" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
+if "%1"=="-d" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
+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 NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts
 
-call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW %1 %2 %3 %4 %5 %6 %7 %8 %9
+echo on
+call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW %regrtest_args%
