mirror of
https://github.com/zebrajr/node.git
synced 2025-12-06 12:20:27 +01:00
tools: remove armv6 from test tools
CI no longer tests armv6. PR-URL: https://github.com/nodejs/node/pull/39162 Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
This commit is contained in:
parent
1f31e3c774
commit
d5113f9e34
|
|
@ -896,8 +896,7 @@ class LiteralTestSuite(TestSuite):
|
||||||
|
|
||||||
|
|
||||||
TIMEOUT_SCALEFACTOR = {
|
TIMEOUT_SCALEFACTOR = {
|
||||||
'armv6' : { 'debug' : 12, 'release' : 3 }, # The ARM buildbots are slow.
|
'arm' : { 'debug' : 8, 'release' : 2 }, # The ARM buildbots are slow.
|
||||||
'arm' : { 'debug' : 8, 'release' : 2 },
|
|
||||||
'ia32' : { 'debug' : 4, 'release' : 1 },
|
'ia32' : { 'debug' : 4, 'release' : 1 },
|
||||||
'ppc' : { 'debug' : 4, 'release' : 1 },
|
'ppc' : { 'debug' : 4, 'release' : 1 },
|
||||||
's390' : { 'debug' : 4, 'release' : 1 } }
|
's390' : { 'debug' : 4, 'release' : 1 } }
|
||||||
|
|
|
||||||
|
|
@ -83,9 +83,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('armv6'): # Can return 'armv6l'.
|
if id.startswith('arm') or id == 'aarch64':
|
||||||
return 'armv6'
|
|
||||||
elif 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'
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user