Skip to content

Commit 67ff6a1

Browse files
paulmonzooba
authored andcommitted
bpo-36511: Windows ARM32 buildbot changes (GH-12917)
1 parent fb7e750 commit 67ff6a1

File tree

2 files changed

+36
-0
lines changed

2 files changed

+36
-0
lines changed

PCbuild/rt.bat

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@ if "%1"=="-O" (set dashO=-O) & shift & goto CheckOpts
3939
if "%1"=="-q" (set qmode=yes) & shift & goto CheckOpts
4040
if "%1"=="-d" (set suffix=_d) & shift & goto CheckOpts
4141
if "%1"=="-x64" (set prefix=%pcbuild%amd64) & shift & goto CheckOpts
42+
if "%1"=="-arm32" (set prefix=%pcbuild%arm32) & shift & goto CheckOpts
4243
if NOT "%1"=="" (set regrtestargs=%regrtestargs% %1) & shift & goto CheckOpts
4344

4445
if not defined prefix set prefix=%pcbuild%win32

Tools/buildbot/test.bat

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ setlocal
55
set here=%~dp0
66
set rt_opts=-q -d
77
set regrtest_args=-j1
8+
set arm32_ssh=
89

910
:CheckOpts
1011
if "%1"=="-x64" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
12+
if "%1"=="-arm32" (set rt_opts=%rt_opts% %1) & (set arm32_ssh=true) & shift & goto CheckOpts
1113
if "%1"=="-d" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
1214
if "%1"=="-O" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
1315
if "%1"=="-q" (set rt_opts=%rt_opts% %1) & shift & goto CheckOpts
@@ -16,4 +18,37 @@ if "%1"=="+q" (set rt_opts=%rt_opts:-q=%) & shift & goto CheckOpts
1618
if NOT "%1"=="" (set regrtest_args=%regrtest_args% %1) & shift & goto CheckOpts
1719

1820
echo on
21+
if "%arm32_ssh%"=="true" goto :Arm32Ssh
22+
1923
call "%here%..\..\PCbuild\rt.bat" %rt_opts% -uall -rwW --slowest --timeout=1200 --fail-env-changed %regrtest_args%
24+
exit /b 0
25+
26+
:Arm32Ssh
27+
set dashU=-unetwork,decimal,subprocess,urlfetch,tzdata
28+
if "%SSH_SERVER%"=="" goto :Arm32SshHelp
29+
if "%PYTHON_SOURCE%"=="" (set PYTHON_SOURCE=%here%..\..\)
30+
if "%REMOTE_PYTHON_DIR%"=="" (set REMOTE_PYTHON_DIR=C:\python\)
31+
set TEMP_ARGS=--temp %REMOTE_PYTHON_DIR%temp
32+
ssh %SSH_SERVER% "if EXIST %REMOTE_PYTHON_DIR% (rd %REMOTE_PYTHON_DIR% /s/q)"
33+
ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%PCBuild\arm32"
34+
ssh %SSH_SERVER% "md %REMOTE_PYTHON_DIR%temp"
35+
for /f "USEBACKQ" %%i in (`dir PCbuild\*.bat /b`) do @scp PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"
36+
for /f "USEBACKQ" %%i in (`dir PCbuild\*.py /b`) do @scp PCBuild\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild"
37+
for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.exe /b`) do @scp PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"
38+
for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.pyd /b`) do @scp PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"
39+
for /f "USEBACKQ" %%i in (`dir PCbuild\arm32\*.dll /b`) do @scp PCBuild\arm32\%%i "%SSH_SERVER%:%REMOTE_PYTHON_DIR%PCBuild\arm32"
40+
scp -r "%PYTHON_SOURCE%Include" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Include"
41+
scp -r "%PYTHON_SOURCE%Lib" "%SSH_SERVER%:%REMOTE_PYTHON_DIR%Lib"
42+
43+
set rt_args=%rt_opts% %dashU% -rwW --slowest --timeout=1200 --fail-env-changed %regrtest_args% %TEMP_ARGS%
44+
ssh %SSH_SERVER% "set TEMP=%REMOTE_PYTHON_DIR%temp & %REMOTE_PYTHON_DIR%PCbuild\rt.bat" %rt_args%
45+
exit /b 0
46+
47+
:Arm32SshHelp
48+
echo SSH_SERVER environment variable must be set to administrator@[ip address]
49+
echo where [ip address] is the address of a Windows IoT Core ARM32 device.
50+
echo.
51+
echo The test worker should have the SSH agent running.
52+
echo Also a key must be created with ssh-keygen and added to both the buildbot worker machine
53+
echo and the ARM32 worker device: see https://docs.microsoft.com/en-us/windows/iot-core/connect-your-device/ssh
54+
exit /b 127

0 commit comments

Comments
 (0)