From 3066f2c0c354dab263c381059921de8725f21da8 Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Mon, 6 Apr 2015 22:52:39 +0200 Subject: [PATCH] test: double test timeout on arm machines 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 --- tools/test.py | 6 +++--- tools/utils.py | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/test.py b/tools/test.py index 8e323df..efb2ed7 100755 --- a/tools/test.py +++ b/tools/test.py @@ -729,8 +729,8 @@ FLAGS = { '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): @@ -770,7 +770,7 @@ class Context(object): 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) diff --git a/tools/utils.py b/tools/utils.py index 232314c..2b312a2 100644 --- a/tools/utils.py +++ b/tools/utils.py @@ -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' -- 2.7.4