From dfe90e8b528be4d9668b1bdc6329f8227cbf307a Mon Sep 17 00:00:00 2001 From: Lars Schneider Date: Thu, 19 Nov 2015 09:58:10 +0100 Subject: [PATCH] git-p4: add trap to kill p4d on test exit Sometimes the "prove" test runner hangs on test exit because p4d is still running. Add a trap to always kill "p4d" on test exit. You can reproduce the problem by commenting "P4D_TIMEOUT" in "lib-git-p4.sh" and running "prove ./t9800-git-p4-basic.sh". Signed-off-by: Lars Schneider Signed-off-by: Jeff King --- t/lib-git-p4.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/t/lib-git-p4.sh b/t/lib-git-p4.sh index acd5578eb5..f9ae1d780d 100644 --- a/t/lib-git-p4.sh +++ b/t/lib-git-p4.sh @@ -74,6 +74,15 @@ cli="$TRASH_DIRECTORY/cli" git="$TRASH_DIRECTORY/git" pidfile="$TRASH_DIRECTORY/p4d.pid" +# Sometimes "prove" seems to hang on exit because p4d is still running +cleanup() { + if test -f "$pidfile" + then + kill -9 $(cat "$pidfile") 2>/dev/null && exit 255 + fi +} +trap cleanup EXIT + # git p4 submit generates a temp file, which will # not get cleaned up if the submission fails. Don't # clutter up /tmp on the test machine. -- 2.11.4.GIT