tools/run-tests.py: A few timeout-related fixes

Review URL: https://codereview.chromium.org/11230029

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12789 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

test/mjsunit/mjsunit.status

@@ -44,6 +44,7 @@ regress/regress-524: SKIP
 # Too slow in debug mode with --stress-opt
 compiler/regress-stacktrace-methods: PASS, SKIP if $mode == debug
 compiler/regress-funcaller: PASS, SKIP if $mode == debug
+regress/regress-2318: PASS, SKIP if $mode == debug
 regress/regress-create-exception: PASS, SKIP if $mode == debug
 
 ##############################################################################

test/mjsunit/testcfg.py

@@ -57,11 +57,10 @@ class MjsunitTestSuite(testsuite.TestSuite):
 
   def GetFlagsForTestCase(self, testcase, context):
     source = self.GetSourceForTest(testcase)
-    flags = []
+    flags = [] + context.mode_flags
     flags_match = re.findall(FLAGS_PATTERN, source)
     for match in flags_match:
       flags += match.strip().split()
-    flags += context.mode_flags
 
     files_list = []  # List of file names to append to command arguments.
     files_match = FILES_PATTERN.search(source);

tools/run-tests.py

@@ -66,6 +66,11 @@ SUPPORTED_ARCHS = ["android_arm",
                    "ia32",
                    "mipsel",
                    "x64"]
+# Double the timeout for these:
+SLOW_ARCHS = ["android_arm",
+              "android_ia32",
+              "arm",
+              "mipsel"]
 
 
 def BuildOptions():
@@ -268,12 +273,12 @@ def Execute(arch, mode, args, options, suites, workspace):
   timeout = options.timeout
   if timeout == -1:
     # Simulators are slow, therefore allow a longer default timeout.
-    if arch in ["android", "arm", "mipsel"]:
+    if arch in SLOW_ARCHS:
       timeout = 2 * TIMEOUT_DEFAULT;
     else:
       timeout = TIMEOUT_DEFAULT;
 
-  options.timeout *= TIMEOUT_SCALEFACTOR[mode]
+  timeout *= TIMEOUT_SCALEFACTOR[mode]
   ctx = context.Context(arch, mode, shell_dir,
                         mode_flags, options.verbose,
                         timeout, options.isolates,