From 848c21b9b9d7af238698012636a398cfe1e7a1be Mon Sep 17 00:00:00 2001 From: Nicolas Williams Date: Wed, 9 Feb 2022 13:00:48 -0600 Subject: [PATCH] tests: Kill kdc harder when failing --- tests/gss/check-basic.in | 4 ++-- tests/gss/check-context.in | 2 +- tests/gss/check-gssmask.in | 2 +- tests/gss/check-ntlm.in | 2 +- tests/gss/check-spnego.in | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/gss/check-basic.in b/tests/gss/check-basic.in index e01e4d73b..515d3efc3 100644 --- a/tests/gss/check-basic.in +++ b/tests/gss/check-basic.in @@ -94,10 +94,10 @@ echo "Doing database check" ${kadmin} check ${R} || exit 1 echo Starting kdc -${kdc} --testing --detach || { echo "kdc failed to start"; cat messages.log; exit 1; } +${kdc} --detach --testing || { echo "kdc failed to start"; cat messages.log; exit 1; } kdcpid=`getpid kdc` -trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT +trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT exitcode=0 diff --git a/tests/gss/check-context.in b/tests/gss/check-context.in index c5a5efb57..46c058d06 100644 --- a/tests/gss/check-context.in +++ b/tests/gss/check-context.in @@ -118,7 +118,7 @@ echo Starting kdc ${kdc} --detach --testing || { echo "kdc failed to start"; cat messages.log; exit 1; } kdcpid=`getpid kdc` -trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT +trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT testfailed="echo test failed; cat messages.log; exit 1" diff --git a/tests/gss/check-gssmask.in b/tests/gss/check-gssmask.in index 941776743..539e2e94e 100644 --- a/tests/gss/check-gssmask.in +++ b/tests/gss/check-gssmask.in @@ -96,7 +96,7 @@ echo Starting kdc ${kdc} --detach --testing || { echo "kdc failed to start"; cat messages.log; exit 1; } kdcpid=`getpid kdc` -trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT +trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT exitcode=0 diff --git a/tests/gss/check-ntlm.in b/tests/gss/check-ntlm.in index d35fb3a40..f953630d0 100644 --- a/tests/gss/check-ntlm.in +++ b/tests/gss/check-ntlm.in @@ -110,7 +110,7 @@ echo Starting kdc ${kdc} --detach --testing || { echo "kdc failed to start"; cat messages.log; exit 1; } kdcpid=`getpid kdc` -trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT +trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT exitcode=0 diff --git a/tests/gss/check-spnego.in b/tests/gss/check-spnego.in index b56dd2a46..d6e4d8331 100644 --- a/tests/gss/check-spnego.in +++ b/tests/gss/check-spnego.in @@ -109,7 +109,7 @@ echo Starting kdc ${kdc} --detach --testing || { echo "kdc failed to start"; cat messages.log; exit 1; } kdcpid=`getpid kdc` -trap "kill ${kdcpid}; echo signal killing kdc; exit 1;" EXIT +trap "kill -9 ${kdcpid}; echo signal killing kdc; exit 1;" EXIT exitcode=0