From e74fe18ebb625224e0bd8f6885c3e65ac3bb29fa Mon Sep 17 00:00:00 2001 From: Zachary Ware Date: Thu, 3 Sep 2015 23:43:37 -0500 Subject: [PATCH] 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 --- Misc/NEWS | 6 ++++++ PCbuild/rt.bat | 4 +++- Tools/buildbot/test.bat | 26 +++++++++++++++----------- 3 files changed, 24 insertions(+), 12 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS index 4ac70d57946..5120b600fd6 100644 --- 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 039c81054a4..2d93b80a499 100644 --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat @@ -32,15 +32,17 @@ set prefix=%pcbuild%win32\ 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 index 154dfa57f17..d1f5f521ba1 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 -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%