Fix deopt fuzzer after test runner changes.

tools/run-deopt-fuzzer.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 301 matching lines @@
         os.path.join(workspace, "test", root))
     if suite:
       suites.append(suite)
 
   if options.download_data:
     for s in suites:
       s.DownloadData()
 
   for mode in options.mode:
     for arch in options.arch:
-      code = Execute(arch, mode, args, options, suites, workspace)
-      exit_code = exit_code or code
+      try:
+        code = Execute(arch, mode, args, options, suites, workspace)
+        exit_code = exit_code or code
+      except KeyboardInterrupt:
+        return 2
   return exit_code
 
 
 def CalculateNTests(m, options):
   """Calculates the number of tests from m deopt points with exponential
   coverage.
   The coverage is expected to be between 0.0 and 1.0.
   The 'coverage lift' lifts the coverage for tests with smaller m values.
   """
   c = float(options.coverage)
@@ skipping 68 matching lines @@
     s.tests = [ t.CopyAddingFlags(analysis_flags) for t in s.tests ]
     num_tests += len(s.tests)
     for t in s.tests:
       t.id = test_id
       test_id += 1
 
   if num_tests == 0:
     print "No tests to run."
     return 0
 
-  try:
-    print(">>> Collection phase")
-    progress_indicator = progress.PROGRESS_INDICATORS[options.progress]()
-    runner = execution.Runner(suites, progress_indicator, ctx)
+  print(">>> Collection phase")
+  progress_indicator = progress.PROGRESS_INDICATORS[options.progress]()
+  runner = execution.Runner(suites, progress_indicator, ctx)
 
-    exit_code = runner.Run(options.j)
-    if runner.terminate:
-      return exit_code
-
-  except KeyboardInterrupt:
-    return 1
+  exit_code = runner.Run(options.j)
 
   print(">>> Analysis phase")
   num_tests = 0
   test_id = 0
   for s in suites:
     test_results = {}
     for t in s.tests:
       for line in t.output.stdout.splitlines():
         if line.startswith("=== Stress deopt counter: "):
           test_results[t.path] = MAX_DEOPT - int(line.split(" ")[-1])
@@ skipping 22 matching lines @@
         s.tests.append(t.CopyAddingFlags(fuzzing_flags))
     num_tests += len(s.tests)
     for t in s.tests:
       t.id = test_id
       test_id += 1
 
   if num_tests == 0:
     print "No tests to run."
     return 0
 
-  try:
-    print(">>> Deopt fuzzing phase (%d test cases)" % num_tests)
-    progress_indicator = progress.PROGRESS_INDICATORS[options.progress]()
-    runner = execution.Runner(suites, progress_indicator, ctx)
+  print(">>> Deopt fuzzing phase (%d test cases)" % num_tests)
+  progress_indicator = progress.PROGRESS_INDICATORS[options.progress]()
+  runner = execution.Runner(suites, progress_indicator, ctx)
 
-    exit_code = runner.Run(options.j)
-    if runner.terminate:
-      return exit_code
-
-  except KeyboardInterrupt:
-    return 1
-
-  return exit_code
+  code = runner.Run(options.j)
+  return exit_code or code
 
 
 if __name__ == "__main__":
   sys.exit(Main())