From d5113f9e3471f6bbd55b638a9b93e6d6d7cb2e6b Mon Sep 17 00:00:00 2001 From: Rich Trott Date: Sat, 26 Jun 2021 08:48:14 -0700 Subject: [PATCH] tools: remove armv6 from test tools CI no longer tests armv6. PR-URL: https://github.com/nodejs/node/pull/39162 Reviewed-By: Luigi Pinca --- tools/test.py | 3 +-- tools/utils.py | 4 +--- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tools/test.py b/tools/test.py index c3a7ff07e23b5d..5d4f48700c427b 100755 --- a/tools/test.py +++ b/tools/test.py @@ -896,8 +896,7 @@ def GetTestStatus(self, context, sections, defs): TIMEOUT_SCALEFACTOR = { - 'armv6' : { 'debug' : 12, 'release' : 3 }, # The ARM buildbots are slow. - 'arm' : { 'debug' : 8, 'release' : 2 }, + 'arm' : { 'debug' : 8, 'release' : 2 }, # The ARM buildbots are slow. 'ia32' : { 'debug' : 4, 'release' : 1 }, 'ppc' : { 'debug' : 4, 'release' : 1 }, 's390' : { 'debug' : 4, 'release' : 1 } } diff --git a/tools/utils.py b/tools/utils.py index e9b38c87b04b70..9d53bd56bd1036 100644 --- a/tools/utils.py +++ b/tools/utils.py @@ -83,9 +83,7 @@ def GuessOS(): def GuessArchitecture(): id = platform.machine() id = id.lower() # Windows 7 capitalizes 'AMD64'. - if id.startswith('armv6'): # Can return 'armv6l'. - return 'armv6' - elif id.startswith('arm') or id == 'aarch64': + 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'