Skip to content

Commit 2574910

Browse files
miss-islingtonStefan Krah
and
Stefan Krah
authored
Update runall.bat to the latest Windows build system. (GH-18571) (#18572)
(cherry picked from commit 9b833e0) Co-authored-by: Stefan Krah <[email protected]> Co-authored-by: Stefan Krah <[email protected]>
1 parent fde0041 commit 2574910

File tree

1 file changed

+59
-41
lines changed

1 file changed

+59
-41
lines changed

Modules/_decimal/tests/runall.bat

Lines changed: 59 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -7,105 +7,123 @@ cd ..\..\..\
77

88
echo.
99
echo # ======================================================================
10-
echo # Building Python
10+
echo # Building Python (Debug^|x64)
1111
echo # ======================================================================
1212
echo.
1313

14-
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x64
15-
msbuild /noconsolelogger /target:clean PCbuild\pcbuild.sln /p:Configuration=Release /p:PlatformTarget=x64
16-
msbuild /noconsolelogger /target:clean PCbuild\pcbuild.sln /p:Configuration=Debug /p:PlatformTarget=x64
17-
msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=x64
18-
msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=x64
19-
20-
call "%VS100COMNTOOLS%\..\..\VC\vcvarsall.bat" x86
21-
msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Release /p:Platform=Win32
22-
msbuild /noconsolelogger PCbuild\pcbuild.sln /p:Configuration=Debug /p:Platform=Win32
23-
echo.
24-
echo.
14+
call .\Tools\buildbot\clean.bat
15+
call .\Tools\buildbot\build.bat -c Debug -p x64
2516

2617
echo.
2718
echo # ======================================================================
28-
echo # test_decimal: platform=x64
19+
echo # platform=Debug^|x64
2920
echo # ======================================================================
3021
echo.
3122

32-
cd PCbuild\amd64
33-
3423
echo # ==================== refleak tests =======================
3524
echo.
36-
python_d.exe -m test -uall -R 2:2 test_decimal
25+
call python.bat -m test -uall -R 3:3 test_decimal
3726
echo.
3827
echo.
3928

4029
echo # ==================== regular tests =======================
4130
echo.
42-
python.exe -m test -uall test_decimal
31+
call python.bat -m test -uall test_decimal
32+
echo.
33+
echo.
34+
35+
echo # ==================== deccheck =======================
36+
echo.
37+
call python.bat .\Modules\_decimal\tests\deccheck.py
4338
echo.
4439
echo.
4540

46-
cd ..
4741

4842
echo.
4943
echo # ======================================================================
50-
echo # test_decimal: platform=x86
44+
echo # Building Python (Release^|x64)
5145
echo # ======================================================================
5246
echo.
5347

54-
echo # ==================== refleak tests =======================
55-
echo.
56-
python_d.exe -m test -uall -R 2:2 test_decimal
48+
call .\Tools\buildbot\clean.bat
49+
call .\Tools\buildbot\build.bat -c Release -p x64
50+
5751
echo.
52+
echo # ======================================================================
53+
echo # platform=Release^|x64
54+
echo # ======================================================================
5855
echo.
5956

6057
echo # ==================== regular tests =======================
6158
echo.
62-
python.exe -m test -uall test_decimal
59+
call python.bat -m test -uall test_decimal
60+
echo.
61+
echo.
62+
63+
echo # ==================== deccheck =======================
64+
echo.
65+
call python.bat .\Modules\_decimal\tests\deccheck.py
66+
echo.
67+
echo.
68+
69+
6370
echo.
71+
echo # ======================================================================
72+
echo # Building Python (Debug^|Win32)
73+
echo # ======================================================================
6474
echo.
6575

66-
cd amd64
76+
call .\Tools\buildbot\clean.bat
77+
call Tools\buildbot\build.bat -c Debug -p Win32
6778

6879
echo.
6980
echo # ======================================================================
70-
echo # deccheck: platform=x64
81+
echo # platform=Debug^|Win32
7182
echo # ======================================================================
7283
echo.
7384

74-
echo # ==================== debug build =======================
85+
echo # ==================== refleak tests =======================
86+
echo.
87+
call python.bat -m test -uall -R 3:3 test_decimal
88+
echo.
89+
echo.
90+
91+
echo # ==================== regular tests =======================
7592
echo.
76-
python_d.exe ..\..\Modules\_decimal\tests\deccheck.py
93+
call python.bat -m test -uall test_decimal
7794
echo.
7895
echo.
7996

80-
echo # =================== release build ======================
97+
echo # ==================== deccheck =======================
8198
echo.
82-
python.exe ..\..\Modules\_decimal\tests\deccheck.py
99+
call python.bat .\Modules\_decimal\tests\deccheck.py
83100
echo.
84101
echo.
85102

86-
cd ..
87103

88104
echo.
89105
echo # ======================================================================
90-
echo # deccheck: platform=x86
106+
echo # Building Python (Release^|Win32)
91107
echo # ======================================================================
92108
echo.
109+
110+
call .\Tools\buildbot\clean.bat
111+
call .\Tools\buildbot\build.bat -c Release -p Win32
112+
113+
echo.
114+
echo # ======================================================================
115+
echo # platform=Release^|Win32
116+
echo # ======================================================================
93117
echo.
94118

95-
echo # ==================== debug build =======================
119+
echo # ==================== regular tests =======================
96120
echo.
97-
python_d.exe ..\Modules\_decimal\tests\deccheck.py
121+
call python.bat -m test -uall test_decimal
98122
echo.
99123
echo.
100124

101-
echo # =================== release build ======================
125+
echo # ==================== deccheck =======================
102126
echo.
103-
python.exe ..\Modules\_decimal\tests\deccheck.py
127+
call python.bat .\Modules\_decimal\tests\deccheck.py
104128
echo.
105129
echo.
106-
107-
108-
cd ..\Modules\_decimal\tests
109-
110-
111-

0 commit comments

Comments
 (0)