Use tools/run-tests.py for "check" targets in the top-level Makefile.

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 156 matching lines @@
   if options.j == 0:
     options.j = multiprocessing.cpu_count()
   if options.no_stress:
     VARIANT_FLAGS = [[], ["--nocrankshaft"]]
   if not options.shell_dir:
     if options.shell:
       print "Warning: --shell is deprecated, use --shell-dir instead."
       options.shell_dir = os.path.dirname(options.shell)
   if options.stress_only:
     VARIANT_FLAGS = [["--stress-opt", "--always-opt"]]
-  # Simulators are slow, therefore allow a longer default timeout.
-  if options.timeout == -1:
-    if options.arch == "arm" or options.arch == "mipsel":
-      options.timeout = 2 * TIMEOUT_DEFAULT;
-    else:
-      options.timeout = TIMEOUT_DEFAULT;
   if options.valgrind:
     run_valgrind = os.path.join("tools", "run-valgrind.py")
     # This is OK for distributed running, so we don't need to set no_network.
     options.command_prefix = ("python -u " + run_valgrind +
                               options.command_prefix)
   return True
 
 
 def ShardTests(tests, shard_count, shard_run):
   if shard_count < 2:
@@ skipping 64 matching lines @@
     if options.buildbot:
       shell_dir = os.path.join(workspace, options.outdir, mode)
       mode = mode.lower()
     else:
       shell_dir = os.path.join(workspace, options.outdir,
                                "%s.%s" % (arch, mode))
   shell_dir = os.path.relpath(shell_dir)
 
   # Populate context object.
   mode_flags = MODE_FLAGS[mode]
+  timeout = options.timeout
+  if timeout == -1:
+    # Simulators are slow, therefore allow a longer default timeout.
+    if arch in ["android", "arm", "mipsel"]:
+      timeout = 2 * TIMEOUT_DEFAULT;
+    else:
+      timeout = TIMEOUT_DEFAULT;
+
   options.timeout *= TIMEOUT_SCALEFACTOR[mode]
   ctx = context.Context(arch, mode, shell_dir,
                         mode_flags, options.verbose,
-                        options.timeout, options.isolates,
+                        timeout, options.isolates,
                         options.command_prefix,
                         options.extra_flags)
 
   # Find available test suites and read test cases from them.
   variables = {
     "mode": mode,
     "arch": arch,
     "system": utils.GuessOS(),
     "isolates": options.isolates
   }
@@ skipping 65 matching lines @@
   except KeyboardInterrupt:
     return 1
 
   if options.time:
     verbose.PrintTestDurations(suites, overall_duration)
   return exit_code
 
 
 if __name__ == "__main__":
   sys.exit(Main())