Skip to content

Commit

Permalink
tools: remove armv6 from test tools
Browse files Browse the repository at this point in the history
CI no longer tests armv6.

PR-URL: #39162
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Trott authored and targos committed Jul 11, 2021
1 parent 1f31e3c commit d5113f9
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 1 addition & 2 deletions tools/test.py
Original file line number Diff line number Diff line change
@@ -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 } }
4 changes: 1 addition & 3 deletions tools/utils.py
Original file line number Diff line number Diff line change
@@ -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'

0 comments on commit d5113f9

Please sign in to comment.