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

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
index 1cc3f1591f3fd9f2c41a23250f72c9abbbd96450..9ae25b4dfc8abfe7636f440ec0e46300456d7fe1 100644 (file)
--- 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
index 3d781be3033092474948a2fed48daf911ea21c19..a65d818cec9772fbf68267d201972179da22e7cf 100644 (file)
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -32,15 +32,17 @@ set prefix=%pcbuild%
 set suffix=\r
 set qmode=\r
 set dashO=\r
+set regrtestargs=\r
 \r
 :CheckOpts\r
 if "%1"=="-O" (set dashO=-O)     & shift & goto CheckOpts\r
 if "%1"=="-q" (set qmode=yes)    & shift & goto CheckOpts\r
 if "%1"=="-d" (set suffix=_d)    & shift & goto CheckOpts\r
 if "%1"=="-x64" (set prefix=%pcbuild%amd64\) & shift & goto CheckOpts\r
+if NOT "%1"=="" (set regrtestargs=%regrtestargs% %1) & shift & goto CheckOpts\r
 \r
-set exe=%prefix%\python%suffix%\r
-set cmd="%exe%" %dashO% -Wd -3 -E -tt "%pcbuild%..\Lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+set exe=%prefix%python%suffix%\r
+set cmd="%exe%" %dashO% -Wd -3 -E -tt "%pcbuild%..\Lib\test\regrtest.py" %regrtestargs%\r
 if defined qmode goto Qmode\r
 \r
 echo Deleting .pyc/.pyo files ...\r

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 58d5d9246b398292658ae3f6dba0a7c6152f0010..b9dde0111351e128c7244bc32be935847e0c8371 100644 (file)
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,15 +1,19 @@
-@rem Used by the buildbot "test" step.\r
-@setlocal\r
+@echo off\r
+rem Used by the buildbot "test" step.\r
+setlocal\r
 \r
-@set here=%~dp0\r
-@set rt_opts=-q -d\r
+set here=%~dp0\r
+set rt_opts=-q -d\r
+set regrtest_args=\r
 \r
 :CheckOpts\r
-@if '%1'=='-x64' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts\r
-@if '%1'=='-d' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts\r
-@if '%1'=='-O' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts\r
-@if '%1'=='-q' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts\r
-@if '%1'=='+d' (set rt_opts=%rt_opts:-d=%) & shift & goto CheckOpts\r
-@if '%1'=='+q' (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts\r
+if "%1"=="-x64" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts\r
+if "%1"=="-d" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts\r
+if "%1"=="-O" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts\r
+if "%1"=="-q" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts\r
+if "%1"=="+d" (set rt_opts=%rt_opts:-d=%) & shift & goto CheckOpts\r
+if "%1"=="+q" (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts\r
+if NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts\r
 \r
-call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+echo on\r
+call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW %regrtest_args%\r