Index: tools/testrunner/local/utils.py |
diff --git a/tools/testrunner/local/utils.py b/tools/testrunner/local/utils.py |
index c880dfc34ebd83dc465efe5d9166559e442e8566..5a5e45e4d5b83323b308d738a89855b63287b87b 100644 |
--- a/tools/testrunner/local/utils.py |
+++ b/tools/testrunner/local/utils.py |
@@ -36,6 +36,18 @@ import subprocess |
import urllib2 |
+ARCHS_WITH_SIMULATOR = [ |
+ "arm", |
+ "arm64", |
+ "mipsel", |
+ "mips64el", |
+ "ppc", |
+ "ppc64", |
+ "s390", |
+ "s390x", |
+ "x87", |
+] |
+ |
def GetSuitePaths(test_root): |
return [ f for f in os.listdir(test_root) if isdir(join(test_root, f)) ] |
@@ -83,8 +95,8 @@ def GuessOS(): |
def UseSimulator(arch): |
machine = platform.machine() |
return (machine and |
- (arch == "mipsel" or arch == "arm" or arch == "arm64") and |
- not arch.startswith(machine)) |
+ arch in ARCHS_WITH_SIMULATOR and |
+ not arch.startswith(machine)) |
Michael Achenbach
2016/04/08 14:09:22
I have no idea if arch.startswith(machine) == True
|
# This will default to building the 32 bit VM even on machines that are |