[test] Fix simulator config in status files.

tools/testrunner/local/utils.py

 # Copyright 2012 the V8 project authors. All rights reserved.
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 #       notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 #       copyright notice, this list of conditions and the following
 #       disclaimer in the documentation and/or other materials provided
@@ skipping 18 matching lines @@
 import os
 from os.path import exists
 from os.path import isdir
 from os.path import join
 import platform
 import re
 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)) ]
 
 
 # Reads a file into an array of strings
 def ReadLinesFrom(name):
   lines = []
   with open(name) as f:
     for line in f:
       if line.startswith('#'): continue
@@ skipping 27 matching lines @@
     return 'netbsd'
   elif system == 'AIX':
     return 'aix'
   else:
     return None
 
 
 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 for the newly added archs,
when on a machine with that arch.

 
 
 # This will default to building the 32 bit VM even on machines that are
 # capable of running the 64 bit VM.
 def DefaultArch():
   machine = platform.machine()
   machine = machine.lower()  # Windows 7 capitalizes 'AMD64'.
   if machine.startswith('arm'):
     return 'arm'
   elif (not machine) or (not re.match('(x|i[3-6])86$', machine) is None):
@@ skipping 31 matching lines @@
       # In python 2.7.6 on windows, urlopen has a problem with redirects.
       # Try using curl instead. Note, this is fixed in 2.7.8.
       subprocess.check_call(["curl", source, '-k', '-L', '-o', destination])
       return
     except:
       # If there's no curl, fall back to urlopen.
       print "Curl is currently not installed. Falling back to python."
       pass
   with open(destination, 'w') as f:
     f.write(urllib2.urlopen(source).read())