1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

test: double test timeout on arm machines

Browse Source 
The ARM buildbots are notoriously slow.  Update the test runner to
double the per-test time limit when it's running on one of them.

PR-URL: https://github.com/iojs/io.js/pull/1357
Reviewed-By: Roman Reiss <me@silverwind.io>
This commit is contained in:
Ben Noordhuis 2015-04-06 22:52:39 +02:00
parent 372bf83818
commit 3066f2c0c3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/test.py
View File

@ -729,8 +729,8 @@ FLAGS = {
'debug' : ['--enable-slow-asserts', '--debug-code', '--verify-heap'], 'debug' : ['--enable-slow-asserts', '--debug-code', '--verify-heap'],
'release' : []} 'release' : []}
TIMEOUT_SCALEFACTOR = { TIMEOUT_SCALEFACTOR = {
'debug' : 4, 'arm' : { 'debug' : 8, 'release' : 2 }, # The ARM buildbots are slow.
'release' : 1 } 'ia32' : { 'debug' : 4, 'release' : 1 } }
class Context(object): class Context(object):
@ -770,7 +770,7 @@ class Context(object):
return testcase.variant_flags + FLAGS[mode] return testcase.variant_flags + FLAGS[mode]
def GetTimeout(self, 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): def RunTestCases(cases_to_run, progress, tasks):
progress = PROGRESS_INDICATORS[progress](cases_to_run) progress = PROGRESS_INDICATORS[progress](cases_to_run)

2
tools/utils.py
View File

@ -73,7 +73,7 @@ def GuessOS():
def GuessArchitecture(): def GuessArchitecture():
id = platform.machine() id = platform.machine()
id = id.lower() # Windows 7 capitalizes 'AMD64'. id = id.lower() # Windows 7 capitalizes 'AMD64'.
if id.startswith('arm'): if id.startswith('arm') or id == 'aarch64':
return 'arm' return 'arm'
elif (not id) or (not re.match('(x|i[3-6])86$', id) is None): elif (not id) or (not re.match('(x|i[3-6])86$', id) is None):
return 'ia32' return 'ia32'