exchange

commit a84c61dd82b17bc42593e5fd358cd0917d195f4f
parent 1cd3f3281b19e2b739eca02a4b21f756e962f78c
Author: Christian Grothoff <christian@grothoff.org>
Date:   Wed, 19 Aug 2020 18:03:45 +0200

fix #6483: ensure cleanup of processes on exit

Diffstat:
M
src/auditor/test-auditor.sh
 | 
10
+++++++++-
M
src/auditor/test-revocation.sh
 | 
10
+++++++++-

2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/auditor/test-auditor.sh b/src/auditor/test-auditor.sh
@@ -36,11 +36,19 @@ function exit_skip() {
 # Exit, with error message (hard failure)
 function exit_fail() {
     echo $1
+    exit 1
+}
+
+# Cleanup to run whenever we exit
+function cleanup()
+{
     kill `jobs -p` >/dev/null 2>/dev/null || true
     wait
-    exit 1
 }
 
+# Install cleanup handler (except for kill -9)
+trap cleanup EXIT
+
 
 # Operations to run before the actual audit
 function pre_audit () {
diff --git a/src/auditor/test-revocation.sh b/src/auditor/test-revocation.sh
@@ -36,11 +36,19 @@ function exit_skip() {
 # Exit, with error message (hard failure)
 function exit_fail() {
     echo $1
+    exit 1
+}
+
+# Cleanup to run whenever we exit
+function cleanup()
+{
     kill `jobs -p` >/dev/null 2>/dev/null || true
     wait
-    exit 1
 }
 
+# Install cleanup handler (except for kill -9)
+trap cleanup EXIT
+
 
 # Operations to run before the actual audit
 function pre_audit () {