From 13689b468cc6ed0514dd0c5864223238f26fb979 Mon Sep 17 00:00:00 2001
From: Linus Nordberg <linus@sunet.se>
Date: Fri, 3 Jan 2020 06:00:29 +0100
Subject: do clean up after p11-kit server even if the openssl operation fail

---
 tests/do-sign.sh   | 11 +++++++----
 tests/do-verify.sh |  9 ++++++---
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/tests/do-sign.sh b/tests/do-sign.sh
index ba5a47e..b953b53 100755
--- a/tests/do-sign.sh
+++ b/tests/do-sign.sh
@@ -8,6 +8,13 @@ OPENSSL_CONF="$1"; shift
 SERVER_PROVIDER=
 [ $# -ge 1 ] && { SERVER_PROVIDER="$1"; shift; }
 
+cleanup() {
+    if [ -n "$SERVER_PROVIDER" ]; then
+	p11-kit server --kill > /dev/null
+    fi
+}
+trap cleanup EXIT
+
 if [ -n "$SERVER_PROVIDER" ]; then
 	P11_KIT_ENV=$(p11-kit server $SERVER_PROVIDER)
 	eval "$P11_KIT_ENV"
@@ -20,7 +27,3 @@ for url in $token_urls; do
 	-sign "${url};pin-value=ffff" \
 	-out $SIGFILE
 done
-
-if [ -n "$SERVER_PROVIDER" ]; then
-	p11-kit server --kill > /dev/null
-fi
diff --git a/tests/do-verify.sh b/tests/do-verify.sh
index f6e5f41..2f4c695 100755
--- a/tests/do-verify.sh
+++ b/tests/do-verify.sh
@@ -8,6 +8,12 @@ OPENSSL_CONF="$1"; shift
 SERVER_PROVIDER=
 [ $# -ge 1 ] && { SERVER_PROVIDER="$1"; shift; }
 
+cleanup() {
+    if [ -n "$SERVER_PROVIDER" ]; then
+	p11-kit server --kill > /dev/null
+    fi
+}
+trap cleanup EXIT
 
 if [ -n "$SERVER_PROVIDER" ]; then
 	P11_KIT_ENV=$(p11-kit server $SERVER_PROVIDER)
@@ -22,6 +28,3 @@ for url in $token_urls; do
 	    -signature $SIGFILE | egrep "^Verified OK$"
 done
 
-if [ -n "$SERVER_PROVIDER" ]; then
-	p11-kit server --kill > /dev/null
-fi
-- 
cgit v1.1