Skip to content
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

Jump to bottom

test: double test timeouts on arm machines #1357

Merged
merged 1 commit into from
Apr 7, 2015
Merged

test: double test timeouts on arm machines #1357

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions tools/test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,8 +729,8 @@ def GetTestStatus(self, context, sections, defs):
'debug' : ['--enable-slow-asserts', '--debug-code', '--verify-heap'],
'release' : []}
TIMEOUT_SCALEFACTOR = {
'debug' : 4,
'release' : 1 }
'arm' : { 'debug' : 8, 'release' : 2 }, # The ARM buildbots are slow.
'ia32' : { 'debug' : 4, 'release' : 1 } }


class Context(object):
Expand Down Expand Up @@ -770,7 +770,7 @@ def GetVmFlags(self, testcase, mode):
return testcase.variant_flags + FLAGS[mode]

def GetTimeout(self, mode):
return self.timeout * TIMEOUT_SCALEFACTOR[mode]
return self.timeout * TIMEOUT_SCALEFACTOR[ARCH_GUESS or 'ia32'][mode]

def RunTestCases(cases_to_run, progress, tasks):
progress = PROGRESS_INDICATORS[progress](cases_to_run)
Expand Down
2 changes: 1 addition & 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,7 @@ def GuessOS():
def GuessArchitecture():
id = platform.machine()
id = id.lower() # Windows 7 capitalizes 'AMD64'.
if id.startswith('arm'):
if 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