From 7ab6cb44e46ce36e8cbb7c6fcfee032c638c8f7b Mon Sep 17 00:00:00 2001
From: Zachary Ware <zachary.ware@gmail.com>
Date: Thu, 3 Sep 2015 23:37:18 -0500
Subject: 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
---
 Misc/NEWS               |  3 +++
 PCbuild/rt.bat          |  6 ++++--
 Tools/buildbot/test.bat | 26 +++++++++++++++-----------
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/Misc/NEWS b/Misc/NEWS
index 1cc3f15..9ae25b4 100644
--- 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 3d781be..a65d818 100644
--- 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
index 58d5d92..b9dde01 100644
--- 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%
-- 
cgit v0.12