[PATCH/RFC] test-lib: clean up trash* directories on SIGINT

From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Jul 11, 2010, 09:51 UTC
Message-ID: <AANLkTimnrLlprdScYDKHs_lIvFKc3K0n8U5vTzG_df2k@mail.gmail.com>

Is there any reason not to remove trash directories on SIGINT? It's annoying that trash directories are left when I cancel a test run.

I can submit an actual patch along these lines once Junio applies some of my other stuff which will probably conflict with any finalized patch.

Is "trap 'foo' INT" a bashism? Is "trap 'foo' SIGINT" more portable? How about the exit code from an INT handler, what should it be?

diff --git a/t/test-lib.sh b/t/test-lib.sh
index ac496aa..e4a0fc9 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -222,6 +222,17 @@ die () {
 GIT_EXIT_OK=
 trap 'die' EXIT

+git_interrupted () {
+       test -d "$remove_trash" &&
+       cd "$(dirname "$remove_trash")" &&
+       rm -rf "$(basename "$remove_trash")"
+
+       # What my shell normal exits on on sigint
+       exit 130
+}
+
+trap 'git_interrupted' INT
+
 # The semantics of the editor variables are that of invoking
 # sh -c "$EDITOR \"$@\"" files ...
 #