Test runner: More fixes.

tools/testrunner/local/execution.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 17 matching lines @@
 
 import multiprocessing
 import os
 import threading
 import time
 
 from . import commands
 from . import utils
 
 
+BREAK_NOW = -1
+EXCEPTION = -2
+
+
 class Job(object):
   def __init__(self, command, dep_command, test_id, timeout, verbose):
     self.command = command
     self.dep_command = dep_command
     self.id = test_id
     self.timeout = timeout
     self.verbose = verbose
 
 
 def RunTest(job):
   try:
     start_time = time.time()
     if job.dep_command is not None:
       dep_output = commands.Execute(job.dep_command, job.verbose, job.timeout)
       # TODO(jkummerow): We approximate the test suite specific function
       # IsFailureOutput() by just checking the exit code here. Currently
       # only cctests define dependencies, for which this simplification is
       # correct.
       if dep_output.exit_code != 0:
         return (job.id, dep_output, time.time() - start_time)
     output = commands.Execute(job.command, job.verbose, job.timeout)
     return (job.id, output, time.time() - start_time)
+  except KeyboardInterrupt:
+    return (-1, BREAK_NOW, 0)
   except Exception, e:
     print(">>> EXCEPTION: %s" % e)
-    return (-1, -1, 0)
+    return (-1, EXCEPTION, 0)
 
 
 class Runner(object):
 
   def __init__(self, suites, progress_indicator, context):
     self.tests = [ t for s in suites for t in s.tests ]
     self._CommonInit(len(self.tests), progress_indicator, context)
 
   def _CommonInit(self, num_tests, progress_indicator, context):
     self.indicator = progress_indicator
@@ skipping 10 matching lines @@
   def Run(self, jobs):
     self.indicator.Starting()
     self._RunInternal(jobs)
     self.indicator.Done()
     return not self.failed
 
   def _RunInternal(self, jobs):
     pool = multiprocessing.Pool(processes=jobs)
     test_map = {}
     queue = []
+    queued_exception = None
     for test in self.tests:
       assert test.id >= 0
       test_map[test.id] = test
-      command = self.GetCommand(test)
+      try:
+        command = self.GetCommand(test)
+      except Exception, e:
+        # If this failed, save the exception and re-raise it later (after
+        # all other tests have had a chance to run).
+        queued_exception = e
+        continue
       timeout = self.context.timeout
       if ("--stress-opt" in test.flags or
           "--stress-opt" in self.context.mode_flags or
           "--stress-opt" in self.context.extra_flags):
         timeout *= 4
       if test.dependency is not None:
         dep_command = [ c.replace(test.path, test.dependency) for c in command ]
       else:
         dep_command = None
       job = Job(command, dep_command, test.id, timeout, self.context.verbose)
       queue.append(job)
     try:
       kChunkSize = 1
       it = pool.imap_unordered(RunTest, queue, kChunkSize)
       for result in it:
         test_id = result[0]
         if test_id < 0:
+          if result[1] == BREAK_NOW:
+            self.terminate = True
+          else:
+            continue
+        if self.terminate:
+          pool.terminate()
+          pool.join()
           raise BreakNowException("User pressed Ctrl+C or IO went wrong")
         test = test_map[test_id]
         self.indicator.AboutToRun(test)
         test.output = result[1]
         test.duration = result[2]
         if test.suite.HasUnexpectedOutput(test):
           self.failed.append(test)
           if test.output.HasCrashed():
             self.crashed += 1
         else:
           self.succeeded += 1
         self.remaining -= 1
         self.indicator.HasRun(test)
-    except:
+    except KeyboardInterrupt:
+      pool.terminate()
+      pool.join()
+    except Exception, e:
+      print("Exception: %s" % e)
       pool.terminate()
       pool.join()
       raise
+    if queued_exception:
+      raise queued_exception
     return
 
 
   def GetCommand(self, test):
     d8testflag = []
     shell = test.suite.shell()
     if shell == "d8":
       d8testflag = ["--test"]
     if utils.IsWindows():
       shell += ".exe"
     cmd = ([self.context.command_prefix] +
            [os.path.join(self.context.shell_dir, shell)] +
            d8testflag +
            test.suite.GetFlagsForTestCase(test, self.context) +
            [self.context.extra_flags])
     cmd = [ c for c in cmd if c != "" ]
     return cmd
 
 
 class BreakNowException(Exception):
   def __init__(self, value):
     self.value = value
   def __str__(self):
     return repr(self.value)