From bcb1919a88ea746460e623dd591f7a00135eadda Mon Sep 17 00:00:00 2001 From: Julian Andres Klode Date: Tue, 24 Jan 2017 19:11:30 +0100 Subject: test suite: Do not exit 0 in trap for QUIT This hides errors in the test suite because it will exit with 0 here. Instead, just do exit 1 in most traps, and do just the cleanup in the QUIT hook. This fixes a regression introduced with the caching of the GPG home directory in 4ce2f35248123ff2366c8c365ad6a94945578d66. --- test/integration/run-tests | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'test') diff --git a/test/integration/run-tests b/test/integration/run-tests index 3dcacc7bd..80f1fc61d 100755 --- a/test/integration/run-tests +++ b/test/integration/run-tests @@ -114,7 +114,8 @@ removesigninghome() { GNUPGHOME="${APT_TEST_SIGNINGHOME}" gpgconf --kill gpg-agent >/dev/null 2>&1 || true rm -rf -- "$APT_TEST_SIGNINGHOME" } -trap "removesigninghome; exit 0" 0 HUP INT QUIT ILL ABRT FPE SEGV PIPE TERM +trap "exit 1" 0 HUP INT ILL ABRT FPE SEGV PIPE TERM +trap "removesigninghome" 0 QUIT export APT_TEST_SIGNINGHOME TOTAL="$(echo "$TESTLIST" | wc -l)" -- cgit v1.2.3-70-g09d2