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.

diff --git a/PCbuild/rt.bat b/PCbuild/rt.bat
index 7129e203491fbf8f92d875463b7b40730f83b7da..9153e7e37ea54ed59e120031837659044bef1e19 100644 (file)
--- 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%

diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
index 4fcd6d435d0428d5ca89b098bb7035e6efa2896c..b4882c29468947220e8563aca2f68ccbbe58d052 100644 (file)
--- a/Tools/buildbot/clean-amd64.bat
+++ b/Tools/buildbot/clean-amd64.bat
@@ -1,2 +1,2 @@
 @rem Used by the buildbot "clean" step.
-call "%~dp0clean.bat"
+@call "%~dp0clean.bat" x64

diff --git a/Tools/buildbot/clean.bat b/Tools/buildbot/clean.bat
index 436c2a1e201f4d3a736c20cb34228f3664ddc90b..f4643a80ee81efceeda41c8e28fe535d6000a96c 100644 (file)
--- a/Tools/buildbot/clean.bat
+++ b/Tools/buildbot/clean.bat
@@ -16,10 +16,18 @@ for %%k in (kill_python.exe
         "%pcbuild%\%%k"
     )
 )
+if "%1" == "x64" (
+    set vcvars_target=x86_amd64
+    set platform_target=x64
+) else (
+    set vcvars_target=x86
+    set platform_target=x86
+)
+call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" %vcvars_target%
+echo Deleting .pyc/.pyo files ...
+del /s "%root%\Lib\*.pyc" "%root%\Lib\*.pyo"
+echo Deleting test leftovers ...
+rmdir /s /q "%root%\build"
 
-echo Purging all non-tracked files with `hg purge`
-echo on
-hg -R "%root%" --config extensions.purge= purge --all -X "%root%\Lib\test\data"
-
-@rem Clean is best effort, so we "always succeed"
-@exit /b 0
+msbuild /target:clean "%pcbuild%\pcbuild.sln" /p:Configuration=Release /p:PlatformTarget=%platform_target%
+msbuild /target:clean "%pcbuild%\pcbuild.sln" /p:Configuration=Debug /p:PlatformTarget=%platform_target%

diff --git a/Tools/buildbot/test-amd64.bat b/Tools/buildbot/test-amd64.bat
index b6932771b1f17b85d6e997f70bca775cff529573..2441e01f2477a40faeee04e10df46d6c19f607cc 100644 (file)
--- a/Tools/buildbot/test-amd64.bat
+++ b/Tools/buildbot/test-amd64.bat
@@ -1,6 +1,7 @@
 @rem Used by the buildbot "test" step.
 
+setlocal
 rem The following line should be removed before #20035 is closed
 set TCL_LIBRARY=%~dp0..\..\..\tcltk64\lib\tcl8.6
 
-"%~dp0..\..\PCbuild\amd64\python_d.exe" "%~dp0..\scripts\run_tests.py" -j 1 -u all -W --timeout=3600 %*
+call "%~dp0..\..\PCbuild\rt.bat" -d -q -x64 -uall -rwW -n --timeout=3600 %*

diff --git a/Tools/buildbot/test.bat b/Tools/buildbot/test.bat
index 3bbfd119ed297003a14fb913791c0002a2b3a90f..1fa0ad94dbea01cef3f68fb667e60f1f67c4e40d 100644 (file)
--- a/Tools/buildbot/test.bat
+++ b/Tools/buildbot/test.bat
@@ -1,16 +1,7 @@
 @rem Used by the buildbot "test" step.
 
+setlocal
 rem The following line should be removed before #20035 is closed
 set TCL_LIBRARY=%~dp0..\..\..\tcltk\lib\tcl8.6
 
-ver | findstr "Version 6." >nul
-if %ERRORLEVEL% == 1 goto xp
-
-"%~dp0..\..\PCbuild\python_d.exe" "%~dp0..\scripts\run_tests.py" -j 1 -u all -W --timeout=3600 %*
-goto done
-
-:xp
-cd PCbuild
-call rt.bat -d -q -uall -rwW -n --timeout=3600 %1 %2 %3 %4 %5 %6 %7 %8 %9
-
-:done
+call "%~dp0..\..\PCbuild\rt.bat" -d -q -uall -rwW -n --timeout=3600 %*