Skip to content

test: increase timeouts on arm #1366

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

Closed
silverwind wants to merge 6 commits into from
Closed

test: increase timeouts on arm #1366

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8855832
test - increase timeouts on ARM
silverwind Apr 7, 2015
0c2210b
Increase timeout in test-child-process-fork-net2
silverwind Apr 8, 2015
30a1882
Simplify arch check, style
silverwind Apr 8, 2015
77f952c
Add a super-slow test mode for armv6
silverwind Apr 8, 2015
e4a5192
Fix syntax
silverwind Apr 8, 2015
d577d19
process.arch
silverwind Apr 9, 2015
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
Add a super-slow test mode for armv6
  • Loading branch information
@silverwind
silverwind committed Apr 8, 2015
commit 77f952cd147d91e7262ad751ea684120f8865c5b
5 changes: 3 additions & 2 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,8 +729,9 @@ def GetTestStatus(self, context, sections, defs):
'debug' : ['--enable-slow-asserts', '--debug-code', '--verify-heap'],
'release' : []}
TIMEOUT_SCALEFACTOR = {
'arm' : { 'debug' : 8, 'release' : 2 }, # The ARM buildbots are slow.
'ia32' : { 'debug' : 4, 'release' : 1 } }
'armv6' : { 'debug' : 12, 'release' : 3 }, # The ARM buildbots are slow.
'arm' : { 'debug' : 8, 'release' : 2 },
'ia32' : { 'debug' : 4, 'release' : 1 } }


class Context(object):
Expand Down
4 changes: 3 additions & 1 deletion tools/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ def GuessOS():
def GuessArchitecture():
id = platform.machine()
id = id.lower() # Windows 7 capitalizes 'AMD64'.
if id.startswith('arm') or id == 'aarch64':
if id.startswith('armv6') # Can return 'armv6l'.
return 'armv6'
elif id.startswith('arm') or id == 'aarch64':
return 'arm'
elif (not id) or (not re.match('(x|i[3-6])86$', id) is None):
return 'ia32'
Expand Down