Skip to content

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

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 21 commits into from
Jun 19, 2019
Merged

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

Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
1d33fe6
bpo-36511: Fix Windows arm32 buildbot pythoninfo, scp, and ssh
May 20, 2019
3aadf52
add +d to match test.bat
May 21, 2019
7f17d29
100% test pass when manually running test.bat
May 22, 2019
9aaa2c4
fix file destination
May 22, 2019
3f38d18
only skip ssl tests on Windows IoT
May 23, 2019
4e147de
Avoid mixing debug/release CRT on Windows
May 23, 2019
9819647
test for win32
May 23, 2019
365701c
propagate exit code
May 23, 2019
69c40d7
fix 2 more exit 0 calls
May 23, 2019
086a1b9
fixes for test_regrtest
May 24, 2019
042e0e9
merge upstream/master
May 24, 2019
e230795
add tools/parser for test_tools
May 24, 2019
1a1f12d
copy entire Tools directory
May 24, 2019
29601d8
skip check on Windows ARM32
May 24, 2019
786194d
restore 64-bit check in test_regrtest
May 24, 2019
cd2d5c5
merge upstream/master
Jun 11, 2019
f5c917a
Update Lib/test/test_math.py
paulmon Jun 19, 2019
e2fb14b
Update Lib/test/test_ssl.py
paulmon Jun 19, 2019
ce3dfbc
Merge remote-tracking branch 'upstream/master' into arm32_pythoninfo
Jun 19, 2019
5c355ab
fix mismatched paren
Jun 19, 2019
f1ce1bf
fix Py_DEBUG_WIN32 spelling
Jun 19, 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
Prev Previous commit
Next Next commit
restore 64-bit check in test_regrtest
  • Loading branch information
Paul Monson committed May 24, 2019
commit 786194d509f3923a9d39ffe353ad9bba521c51e2
8 changes: 4 additions & 4 deletions Lib/test/test_regrtest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ def test_tools_buildbot_test(self):
# Tools\buildbot\test.bat
script = os.path.join(ROOT_DIR, 'Tools', 'buildbot', 'test.bat')
test_args = ['--testdir=%s' % self.tmptestdir]
if platform.machine() == 'AMD64':
test_args.append('-x64') # 64-bit Intel build
if platform.machine() == 'ARM':
test_args.append('-arm32') # 32-bit ARM build
elif platform.architecture()[0] == '64bit':
test_args.append('-x64') # 64-bit build
if not Py_DEBUG:
test_args.append('+d') # Release build, use python.exe
self.run_batch(script, *test_args, *self.tests)
Expand All @@ -631,10 +631,10 @@ def test_pcbuild_rt(self):
if not os.path.isfile(script):
self.skipTest(f'File "{script}" does not exist')
rt_args = ["-q"] # Quick, don't run tests twice
if platform.machine() == 'AMD64':
rt_args.append('-x64') # 64-bit Intel build
if platform.machine() == 'ARM':
rt_args.append('-arm32') # 32-bit ARM build
elif platform.architecture()[0] == '64bit':
rt_args.append('-x64') # 64-bit build
if Py_DEBUG:
rt_args.append('-d') # Debug build, use python_d.exe
self.run_batch(script, *rt_args, *self.regrtest_args, *self.tests)
Expand Down