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.

4 files changed, 19 insertions, 19 deletions

diff --git a/Tools/buildbot/clean-amd64.bat b/Tools/buildbot/clean-amd64.bat
index 4fcd6d4..b4882c2 100644
--- 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 436c2a1..f4643a8 100644
--- 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 b693277..2441e01 100644
--- 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 3bbfd11..1fa0ad9 100644
--- 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 %*