Test

oldium · Oct 2, 2024 · 158e44d · 158e44d
1 parent 20c1ad9
commit 158e44d
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/pins/tpm1/tests/tpm1-common-test-functions b/src/pins/tpm1/tests/tpm1-common-test-functions
@@ -47,7 +47,12 @@ function on_exit() {
 
     # Cleanup sw emulation
     [ -n "$TCSD_PID" ] && kill $TCSD_PID >/dev/null 2>&1
-    [ -n "$SWTPM_SOCKET_PID" ] && kill $SWTPM_SOCKET_PID >/dev/null 2>&1
+    if [ -n "$SWTPM_SOCKET_PID" ]; then
+        kill $SWTPM_SOCKET_PID >/dev/null 2>&1
+        sleep .5
+		# swtpm does not always terminate gracefully, so kill it
+        kill -9 $SWTPM_SOCKET_PID >/dev/null 2>&1
+    fi
 }
 if ! TESTDIR="$(mktemp -d)"; then
     echo "Creating a temporary dir for TPM files failed!" >&2