commit d82d84664af1da94aef06febf860418f82f97358
author Hanno Becker <hanno.becker@arm.com> Mon May 29 21:37:46 2017 +0100
committer Hanno Becker <hanno.becker@arm.com> Tue Oct 10 16:04:32 2017 +0100
tree d7c19237b12a119ef095982aed8b09f59ab347b8
parent cadb5bbe3c332ee460e9a0f60e563cb1cf01d48d

ssl-opt.sh: Kill server via KILL signal if TERM doesn't succeed

tests/ssl-opt.sh

diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 821df21..fbb689a 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -447,10 +447,19 @@
 
         # terminate the server (and the proxy)
         kill $SRV_PID
-        wait $SRV_PID
+        sleep 0.01
+        if kill -0 $SRV_PID >/dev/null 2>&1; then
+            kill -KILL $SRV_PID
+            wait $SRV_PID
+        fi
+
         if [ -n "$PXY_CMD" ]; then
             kill $PXY_PID >/dev/null 2>&1
-            wait $PXY_PID
+            sleep 0.01
+            if kill -0 $PXY_PID >/dev/null 2>&1; then
+                kill -KILL $pXY_PID
+                wait $PXY_PID
+            fi
         fi
 
         # retry only on timeouts