Update runall.bat to the latest Windows build system. (GH-18571) (#18573

) (cherry picked from commit 9b833e0) Co-authored-by: Stefan Krah <skrah@bytereef.org> Co-authored-by: Stefan Krah <skrah@bytereef.org>
python · Feb 20, 2020 · 471d2b9 · 471d2b9
1 parent 44c6901
commit 471d2b9
Showing 1 changed file with 59 additions and 41 deletions.
diff --git a/Modules/_decimal/tests/runall.bat b/Modules/_decimal/tests/runall.bat
@@ -7,105 +7,123 @@ cd ..\..\..\
 
 echo.
 echo # ======================================================================
-echo #                            Building Python
+echo #                      Building Python (Debug^|x64)
 echo # ======================================================================
 echo.
 
-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
-msbuild /noconsolelogger /target:clean PCbuild\pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x64
-msbuild /noconsolelogger /target:clean PCbuild\pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x64
-msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=x64
-msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64
-
-call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
-msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32
-msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32
-echo.
-echo.
+call .\Tools\buildbot\clean.bat
+call .\Tools\buildbot\build.bat -c Debug -p x64
 
 echo.
 echo # ======================================================================
-echo #                       test_decimal: platform=x64
+echo #                           platform=Debug^|x64
 echo # ======================================================================
 echo.
 
-cd PCbuild\amd64
-
 echo # ==================== refleak tests =======================
 echo.
-python_d.exe -m test -uall -R 2:2 test_decimal
+call python.bat -m test -uall -R 3:3 test_decimal
 echo.
 echo.
 
 echo # ==================== regular tests =======================
 echo.
-python.exe -m test -uall test_decimal
+call python.bat -m test -uall test_decimal
+echo.
+echo.
+
+echo # ==================== deccheck =======================
+echo.
+call python.bat .\Modules\_decimal\tests\deccheck.py
 echo.
 echo.
 
-cd ..
 
 echo.
 echo # ======================================================================
-echo #                       test_decimal: platform=x86
+echo #                      Building Python (Release^|x64)
 echo # ======================================================================
 echo.
 
-echo # ==================== refleak tests =======================
-echo.
-python_d.exe -m test -uall -R 2:2 test_decimal
+call .\Tools\buildbot\clean.bat
+call .\Tools\buildbot\build.bat -c Release -p x64
+
 echo.
+echo # ======================================================================
+echo #                          platform=Release^|x64
+echo # ======================================================================
 echo.
 
 echo # ==================== regular tests =======================
 echo.
-python.exe -m test -uall test_decimal
+call python.bat -m test -uall test_decimal
+echo.
+echo.
+
+echo # ==================== deccheck =======================
+echo.
+call python.bat .\Modules\_decimal\tests\deccheck.py
+echo.
+echo.
+
+
 echo.
+echo # ======================================================================
+echo #                      Building Python (Debug^|Win32)
+echo # ======================================================================
 echo.
 
-cd amd64
+call .\Tools\buildbot\clean.bat
+call Tools\buildbot\build.bat -c Debug -p Win32
 
 echo.
 echo # ======================================================================
-echo #                         deccheck: platform=x64
+echo #                         platform=Debug^|Win32
 echo # ======================================================================
 echo.
 
-echo # ==================== debug build =======================
+echo # ==================== refleak tests =======================
+echo.
+call python.bat -m test -uall -R 3:3 test_decimal
+echo.
+echo.
+
+echo # ==================== regular tests =======================
 echo.
-python_d.exe ..\..\Modules\_decimal\tests\deccheck.py
+call python.bat -m test -uall test_decimal
 echo.
 echo.
 
-echo # =================== release build ======================
+echo # ==================== deccheck =======================
 echo.
-python.exe ..\..\Modules\_decimal\tests\deccheck.py
+call python.bat .\Modules\_decimal\tests\deccheck.py
 echo.
 echo.
 
-cd ..
 
 echo.
 echo # ======================================================================
-echo #                         deccheck: platform=x86
+echo #                      Building Python (Release^|Win32)
 echo # ======================================================================
 echo.
+
+call .\Tools\buildbot\clean.bat
+call .\Tools\buildbot\build.bat -c Release -p Win32
+
+echo.
+echo # ======================================================================
+echo #                          platform=Release^|Win32
+echo # ======================================================================
 echo.
 
-echo # ==================== debug build =======================
+echo # ==================== regular tests =======================
 echo.
-python_d.exe ..\Modules\_decimal\tests\deccheck.py
+call python.bat -m test -uall test_decimal
 echo.
 echo.
 
-echo # =================== release build ======================
+echo # ==================== deccheck =======================
 echo.
-python.exe ..\Modules\_decimal\tests\deccheck.py
+call python.bat .\Modules\_decimal\tests\deccheck.py
 echo.
 echo.
-
-
-cd ..\Modules\_decimal\tests
-
-
-