[Python-checkins] cpython (merge 3.5 -> default): Merge with 3.5

[zach.ware]

https://hg.python.org/cpython/rev/30723278b74f
changeset:   97645:30723278b74f
parent:      97640:c6e0c29913ec
parent:      97643:10600293b466
user:        Zachary Ware <zachary.ware at gmail.com>
date:        Thu Sep 03 23:51:07 2015 -0500
summary:
  Merge with 3.5

files:
  Misc/NEWS               |   3 +++
  PCbuild/rt.bat          |   4 +++-
  Tools/buildbot/test.bat |  26 +++++++++++++++-----------
  3 files changed, 21 insertions(+), 12 deletions(-)


diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -80,6 +80,9 @@
 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.1
 ==========================
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
--- a/PCbuild/rt.bat
+++ b/PCbuild/rt.bat
@@ -32,15 +32,17 @@
 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%.exe
-set cmd="%exe%" %dashO% -Wd -E -bb "%pcbuild%..\lib\test\regrtest.py" %1 %2 %3 %4 %5 %6 %7 %8 %9
+set cmd="%exe%" %dashO% -Wd -E -bb "%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
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,15 +1,19 @@
- at rem Used by the buildbot "test" step.
- at setlocal
+ at echo off
+rem Used by the buildbot "test" step.
+setlocal
 
- at set here=%~dp0
- at set rt_opts=-q -d
+set here=%~dp0
+set rt_opts=-q -d
+set regrtest_args=
 
 :CheckOpts
- at if '%1'=='-x64' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
- at if '%1'=='-d' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
- at if '%1'=='-O' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
- at if '%1'=='-q' (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
- at if '%1'=='+d' (set rt_opts=%rt_opts:-d=%) & shift & goto CheckOpts
- at 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 -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9
+echo on
+call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW -n --timeout=3600 %regrtest_args%

-- 
Repository URL: https://hg.python.org/cpython