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

This makes it possible to pass more than 4 tests by name through
Tools\buildbot\test.bat

diff --git a/Misc/NEWS b/Misc/NEWS
index 4ac70d57946f42f9d3c2f8c8d49162566d6657ba..5120b600fd656c3303a6a50f450fa2a902eb2b1e 100644 (file)
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -56,6 +56,12 @@ Documentation
 - Issue #22812: Fix unittest discovery examples.
   Patch from Pam McA'Nulty.
 
+Tests
+-----
+
+- 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 3.5.0 release candidate 3?
 ===============================================

diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index 039c81054a4e0de15c78ad6049a6bc03672a43d0..2d93b80a499fa5ee43a3c851cf8d1a102c6bab4c 100644 (file)
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -32,15 +32,17 @@ set prefix=%pcbuild%win32\
 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%.exe\r
-set cmd="%exe%" %dashO% -Wd -E -bb "%pcbuild%..\lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+set cmd="%exe%" %dashO% -Wd -E -bb "%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 154dfa57f1764d01c380a7f8376aca1c0955fa11..d1f5f521ba1df5263703f35cf95a3e2e97ffa793 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 -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9\r
+echo on\r
+call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW -n --timeout=3600 %regrtest_args%\r