Obtain process output on timeout

This allows us to use the result of runs that timed out.

Signed-off-by: Stefan Marr <[email protected]>

rebench/subprocess_with_timeout.py

@@ -95,20 +95,22 @@ def run(args, cwd = None, shell = False, kill_tree = True, timeout = -1,
 
     if timeout != -1 and thread.is_alive():
         assert thread.pid is not None
-        return kill_process(thread.pid, kill_tree)
+        return kill_process(thread.pid, kill_tree, thread)
 
     return thread.returncode, thread.stdout_result, thread.stderr_result
 
 
-def kill_process(pid, recursively):
+def kill_process(pid, recursively, thread):
     pids = [pid]
     if recursively:
         pids.extend(get_process_children(pid))
 
     for p in pids:
         kill(p, SIGKILL)
 
-    return -9, '', ''
+    thread.join()
+
+    return -9, thread.stdout_result, thread.stderr_result
 
 
 def get_process_children(pid):

rebench/tests/subprocess_timeout_test.py

@@ -50,7 +50,7 @@ def test_exec_with_timeout(self):
 
         self.assertEqual(-9,   return_code)
         self.assertEqual("",   output)
-        self.assertEqual("", err)
+        self.assertEqual(None, err)
 
     def test_exec_with_timeout_python_interpreter(self):
         cmdline = "python -c \"while True: pass\""
@@ -61,7 +61,7 @@ def test_exec_with_timeout_python_interpreter(self):
 
         self.assertEqual(-9, return_code)
         self.assertEqual("", output)
-        self.assertEqual("", err)
+        self.assertEqual(None, err)
 
 
 def test_suite():