Fix test runner for Android.

tools/run-tests.py

 #!/usr/bin/env python
 #
 # 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
@@ skipping 42 matching lines @@
 
 # Use this to run several variants of the tests.
 VARIANT_FLAGS = [[],
                  ["--stress-opt", "--always-opt"],
                  ["--nocrankshaft"]]
 MODE_FLAGS = {
     "debug"   : ["--nobreak-on-abort", "--nodead-code-elimination",
                  "--enable-slow-asserts", "--debug-code", "--verify-heap"],
     "release" : ["--nobreak-on-abort", "--nodead-code-elimination"]}
 
+SUPPORTED_ARCHS = ["android_arm",
+                   "android_ia32",
+                   "arm",
+                   "ia32",
+                   "mipsel",
+                   "x64"]
+
 
 def BuildOptions():
   result = optparse.OptionParser()
   result.add_option("--arch",
                     help=("The architecture to run tests for, "
                           "'auto' or 'native' for auto-detect"),
                     default="ia32,x64,arm")
   result.add_option("--arch-and-mode",
                     help="Architecture and mode in the format 'arch.mode'",
                     default=None)
@@ skipping 70 matching lines @@
     options.mode = tokens[1]
   options.mode = options.mode.split(",")
   for mode in options.mode:
     if not mode in ["debug", "release"]:
       print "Unknown mode %s" % mode
       return False
   if options.arch in ["auto", "native"]:
     options.arch = ARCH_GUESS
   options.arch = options.arch.split(",")
   for arch in options.arch:
-    if not arch in ['ia32', 'x64', 'arm', 'mipsel']:
+    if not arch in SUPPORTED_ARCHS:
       print "Unknown architecture %s" % arch
       return False
 
   # Special processing of other options, sorted alphabetically.
 
   if options.buildbot:
     # Buildbots run presubmit tests as a separate step.
     options.no_presubmit = True
     options.no_network = True
   if options.command_prefix:
@@ skipping 184 matching lines @@
   except KeyboardInterrupt:
     return 1
 
   if options.time:
     verbose.PrintTestDurations(suites, overall_duration)
   return exit_code
 
 
 if __name__ == "__main__":
   sys.exit(Main())