diff options
| author | Zachary Ware <zachary.ware@gmail.com> | 2014-10-13 05:17:23 (GMT) |
|---|---|---|
| committer | Zachary Ware <zachary.ware@gmail.com> | 2014-10-13 05:17:23 (GMT) |
| commit | 6f3bdc94848d8c99ad2b7eb79e90ddb6e9f602c6 (patch) | |
| tree | 22100d11fce7a02a851de901ded7b426e3afe76f /PCbuild | |
| parent | 2fb369c0d318481b3931821fe517c628814df03a (diff) | |
| download | cpython-6f3bdc94848d8c99ad2b7eb79e90ddb6e9f602c6.zip cpython-6f3bdc94848d8c99ad2b7eb79e90ddb6e9f602c6.tar.gz cpython-6f3bdc94848d8c99ad2b7eb79e90ddb6e9f602c6.tar.bz2 | |
Issue #21907: Partially revert changes to Windows buildbot scripts.
Trying to use run_tests.py for testing is more trouble than it's
worth; reverted to rt.bat. Also cleaned up rt.bat a bit.
Trying to use hg purge to clean up after testing is also
error-prone, so we're back to using the build solution's Clean
targets.
Diffstat (limited to 'PCbuild')
| -rw-r--r-- | PCbuild/rt.bat | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat index 7129e20..9153e7e 100644 --- a/PCbuild/rt.bat +++ b/PCbuild/rt.bat @@ -9,7 +9,8 @@ rem -q runs the tests just once, and without deleting .py[co] files. rem -x64 Run the 64-bit build of python (or python_d if -d was specified) rem from the 'amd64' dir instead of the 32-bit build in this dir. rem All leading instances of these switches are shifted off, and -rem whatever remains is passed to regrtest.py. For example, +rem whatever remains (up to 9 arguments) is passed to regrtest.py. +rem For example, rem rt -O -d -x test_thread rem runs rem python_d -O ../lib/test/regrtest.py -x test_thread @@ -26,25 +27,24 @@ rem rt -u "network,largefile" setlocal -set prefix=.\ +set pcbuild=%~dp0 +set prefix=%pcbuild% set suffix= set qmode= set dashO= -set tcltk=tcltk :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=amd64) & (set tcltk=tcltk64) & shift & goto CheckOpts +if "%1"=="-x64" (set prefix=%pcbuild%amd64\) & shift & goto CheckOpts -PATH %PATH%;%~dp0..\..\%tcltk%\bin -set exe=%prefix%\python%suffix% -set cmd=%exe% %dashO% -Wd -E -bb ../lib/test/regrtest.py %1 %2 %3 %4 %5 %6 %7 %8 %9 +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 if defined qmode goto Qmode echo Deleting .pyc/.pyo files ... -%exe% rmpyc.py +"%exe%" "%pcbuild%rmpyc.py" echo on %cmd% |