From: Jeff King Date: Fri, 13 Mar 2015 04:48:48 +0000 (-0400) Subject: t: translate SIGINT to an exit X-Git-Tag: v2.4.0-rc0~24^2~4 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da706545f7;p=thirdparty%2Fgit.git t: translate SIGINT to an exit Right now if a test script receives SIGINT (e.g., because a test was hanging and the user hit ^C), the shell exits immediately. This can be annoying if the test script did any global setup, like starting apache or git-daemon, as it will not have an opportunity to clean up after itself. A subsequent run of the test won't be able to start its own daemon, and will either fail or skip the tests. Instead, let's trap SIGINT to make sure we do a clean shutdown, and just chain it to a normal exit (which will trigger any cleanup). Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- diff --git a/t/test-lib.sh b/t/test-lib.sh index c09677802c..f4ba3ff972 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -299,6 +299,7 @@ die () { GIT_EXIT_OK= trap 'die' EXIT +trap 'exit $?' INT # The user-facing functions are loaded from a separate file so that # test_perf subshells can have them too