--- a/tests/run-tests.py	Sun Jun 02 16:29:22 2013 -0500
+++ b/tests/run-tests.py	Sun Jun 02 16:29:35 2013 -0500
@@ -863,6 +863,9 @@
     if ret:
         killdaemons(env['DAEMON_PIDS'])
 
+    if abort:
+        raise KeyboardInterrupt()
+
     for s, r in replacements:
         output = re.sub(s, r, output)
     return ret, output.splitlines(True)
@@ -1182,6 +1185,7 @@
 resultslock = threading.Lock()
 times = []
 iolock = threading.Lock()
+abort = False
 
 def runqueue(options, tests):
     for test in tests: