From a53cb6451ecd353565a3c95f2b3af8b8b98af5ee Mon Sep 17 00:00:00 2001
From: Boming Zhang <bomingzh@sjtu.edu.cn>
Date: Fri, 21 Mar 2025 01:38:38 -0400
Subject: [PATCH] fix(executor/local): wait after kill

---
 internal/executor/local/executor.go | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/internal/executor/local/executor.go b/internal/executor/local/executor.go
index c70d8b0..f33d2a7 100644
--- a/internal/executor/local/executor.go
+++ b/internal/executor/local/executor.go
@@ -27,6 +27,9 @@ func (e *Local) generateResult(
 		ExitStatus: processState.ExitCode(),
 		Error:      "",
 		Time: func() uint64 {
+			if isTimeout {
+				return 0
+			}
 			nanos := processState.UserTime().Nanoseconds()
 			if nanos < 0 {
 				return 0
@@ -148,8 +151,9 @@ func (e *Local) Run(cmds []stage.Cmd) ([]stage.ExecutorResult, error) {
 			results = append(results, result)
 		case <-time.After(duration):
 			_ = execCmd.Process.Kill()
+			err := execCmd.Wait()
 			result := e.generateResult(
-				nil,
+				err,
 				execCmd.ProcessState,
 				duration,
 				cmd,