Skip to content

bpo-36511: Fix Windows arm32 buildbot, pythoninfo, scp, and ssh #91

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 13, 2019
Merged

bpo-36511: Fix Windows arm32 buildbot, pythoninfo, scp, and ssh #91

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
77584b3
bpo-36511: Fix Windows arm32 buildbot, pythoninfo, scp, and ssh
May 20, 2019
911a98b
add +d to match test.bat
May 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 36 additions & 7 deletions master/custom/factories.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,14 +260,19 @@ class DTraceCLangBuild(UnixBuild):

class WindowsBuild(TaggedBuildFactory):
build_command = [r"Tools\buildbot\build.bat"]
remote_deploy_command = [r"Tools\buildbot\remoteDeploy.bat"]
remote_pythonInfo_command = [r"Tools\buildbot\remotePythoninfo.bat"]
test_command = [r"Tools\buildbot\test.bat"]
clean_command = [r"Tools\buildbot\clean.bat"]
python_command = [r"python.bat"]
buildFlags = []
remoteDeployFlags = []
remotePythonInfoFlags = []
testFlags = ["-j2"]
cleanFlags = []
test_timeout = None
factory_tags = ["win32"]
remoteTest = False

def setup(self, parallel, branch, **kwargs):
build_command = self.build_command + self.buildFlags
Expand All @@ -276,14 +281,34 @@ def setup(self, parallel, branch, **kwargs):
if parallel:
test_command.append(parallel)
self.addStep(Compile(command=build_command))
self.addStep(
ShellCommand(
name="pythoninfo",
description="pythoninfo",
command=self.python_command + ["-m", "test.pythoninfo"],
warnOnFailure=True,
if self.remoteTest:
# deploy
self.addStep(
ShellCommand(
name="remotedeploy",
description="remotedeploy",
command=self.remote_deploy_command + self.remoteDeployFlags,
warnOnFailure=True,
)
)
# pythonInfo
self.addStep(
ShellCommand(
name="remotepythoninfo",
description="remotepythoninfo",
command=self.remote_pythonInfo_command + self.remotePythonInfoFlags,
warnOnFailure=True,
)
)
else:
self.addStep(
ShellCommand(
name="pythoninfo",
description="pythoninfo",
command=self.python_command + ["-m", "test.pythoninfo"],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This line doesn't call any .bat files. It ends up executing an arm32 binary on the x86/x64 build host which doesn't work

warnOnFailure=True,
)
)
)
# timeout is a bit more than the regrtest default timeout
if self.test_timeout:
timeout = self.test_timeout
Expand Down Expand Up @@ -378,6 +403,9 @@ class WindowsArm32Build(WindowsBuild):
buildFlags = ["-p", "ARM", "--no-tkinter"]
# test_multiprocessing_spawn doesn't complete over simple ssh connection
# skip test_multiprocessing_spawn for now
remoteTest = True
remoteDeployFlags = ["-arm32"]
remotePythonInfoFlags = ["-arm32"]
testFlags = ["-arm32", "-j2", "-x", "test_multiprocessing_spawn", "-x", "test_winconsoleio", "-x", "test_distutils"]
cleanFlags = ["-p", "ARM", "--no-tkinter"]
factory_tags = ["win-arm32"]
Expand All @@ -386,6 +414,7 @@ class WindowsArm32Build(WindowsBuild):
class WindowsArm32ReleaseBuild(WindowsArm32Build):
buildersuffix = ".nondebug"
buildFlags = WindowsArm32Build.buildFlags + ["-c", "Release"]
remotePythonInfoFlags = WindowsArm32Build.remotePythonInfoFlags + ["+d"]
testFlags = WindowsArm32Build.testFlags + ["+d"]
# keep default cleanFlags, both configurations get cleaned
factory_tags = ["win-arm32", "nondebug"]