Properly handle keyboard interrupt in run-tests.py (#382)

We shouldn't eat Exceptions, just our own local Errors; that way bugs in
the test runner propagate out to give us nice stack traces.

1 files changed, 3 insertions, 5 deletions

diff --git a/test/run-tests.py b/test/run-tests.py
index 64a90167..e4765355 100755
--- a/test/run-tests.py
+++ b/test/run-tests.py
@@ -535,13 +535,13 @@ def RunTest(info, options, variables, verbose_level=0):
     cmd = info.GetCommand(rel_gen_input_path, variables, options.arg,
                           verbose_level)
     return RunCommandWithTimeout(cmd, cwd, timeout, verbose_level > 0)
-  except (Exception, KeyboardInterrupt) as e:
+  except (Error, KeyboardInterrupt) as e:
     return e
 
 
 def HandleTestResult(status, info, result, rebase=False):
   try:
-    if isinstance(result, Exception):
+    if isinstance(result, (Error, KeyboardInterrupt)):
       raise result
 
     stdout, stderr, returncode, duration = result
@@ -570,7 +570,7 @@ def HandleTestResult(status, info, result, rebase=False):
         else:
           info.Diff(stdout, stderr)
         status.Passed(info, duration)
-  except Exception as e:
+  except Error as e:
     status.Failed(info, str(e))
 
 
@@ -623,8 +623,6 @@ def RunMultiThreaded(infos_to_run, status, options, variables):
       time.sleep(0.01)
       results = new_results
     pool.close()
-  except KeyboardInterrupt:
-    pass
   finally:
     pool.terminate()
     pool.join()