scripts/*.test: delay reaping servers in cleanup handlers to allow sanitizers to finish rendering backtraces.

scripts/benchmark.test

@@ -60,8 +60,10 @@ remove_ready_file() {
 do_cleanup() {
     echo "in cleanup"
 
-    if  [ $server_pid != $no_pid ]
+    if [ $server_pid != $no_pid ] && kill -0 $server_pid
     then
+        # sleep to give sanitizers time to dump backtraces.
+        sleep 1
         echo "killing server"
         kill -9 $server_pid
     fi

scripts/crl-revoked.test

@@ -63,8 +63,10 @@ remove_ready_file() {
 abort_trap() {
     echo "script aborted"
 
-    if  [ $server_pid != $no_pid ]
+    if [ $server_pid != $no_pid ] && kill -0 $server_pid
     then
+        # sleep to give sanitizers time to dump backtraces.
+        sleep 1
         echo "killing server"
         kill -9 $server_pid
     fi

scripts/dtls.test

@@ -39,8 +39,12 @@ if [ "${AM_BWRAPPED-}" != "yes" ]; then
 fi
 
 kill_server() {
+    sleepseconds=1
     for i in $(jobs -pr); do
         if [ "$i" != "$TCPDUMP_PID" ]; then
+            # sleep to give sanitizers time to dump backtraces.
+            sleep $sleepseconds
+            sleepseconds=0
             kill -9 $i
         fi
     done

scripts/openssl.test

@@ -141,14 +141,21 @@ do_cleanup() {
     echo "in cleanup"
 
     IFS=$OIFS #restore separator
+    sleepseconds=1
     for s in $servers
     do
         f2=${s%:*}
         sname=${f2%:*}
         pid=${f2##*:}
         port=${s##*:}
-        echo "killing server: $sname ($port)"
-        kill -9 "$pid"
+        if kill -0 "$pid"
+        then
+            # sleep to give sanitizers time to dump backtraces.
+            sleep $sleepseconds
+            sleepseconds=0
+            echo "killing server: $sname ($port)"
+            kill -9 "$pid"
+        fi
     done
 }
 

scripts/pkcallbacks.test

@@ -54,8 +54,10 @@ remove_ready_file() {
 do_cleanup() {
     echo "in cleanup"
 
-    if  [ $server_pid != $no_pid ]
+    if [ $server_pid != $no_pid ] && kill -0 $server_pid
     then
+        # sleep to give sanitizers time to dump backtraces.
+        sleep 1
         echo "killing server"
         kill -9 $server_pid
     fi
@@ -67,8 +69,10 @@ do_cleanup() {
 abort_trap() {
     echo "script aborted"
 
-    if  [ $server_pid != $no_pid ]
+    if [ $server_pid != $no_pid ] && kill -0 $server_pid
     then
+        # sleep to give sanitizers time to dump backtraces.
+        sleep 1
         echo "killing server"
         kill -9 $server_pid
     fi

scripts/psk.test

@@ -63,8 +63,10 @@ remove_ready_file() {
 do_cleanup() {
     echo "in cleanup"
 
-    if  [ $server_pid != $no_pid ]
+    if [ $server_pid != $no_pid ] && kill -0 $server_pid
     then
+        # sleep to give sanitizers time to dump backtraces.
+        sleep 1
         echo "killing server"
         kill -9 $server_pid
     fi

scripts/resume.test

@@ -44,8 +44,10 @@ remove_ready_file() {
 do_cleanup() {
     echo "in cleanup"
 
-    if  [ $server_pid != $no_pid ]
+    if [ $server_pid != $no_pid ] && kill -0 $server_pid
     then
+        # sleep to give sanitizers time to dump backtraces.
+        sleep 1
         echo "killing server"
         kill -9 $server_pid
     fi

scripts/tls13.test

@@ -74,8 +74,10 @@ remove_ready_file() {
 do_cleanup() {
     echo "in cleanup"
 
-    if  [ $server_pid != $no_pid ]
+    if [ $server_pid != $no_pid ] && kill -0 $server_pid
     then
+        # sleep to give sanitizers time to dump backtraces.
+        sleep 1
         echo "killing server"
         kill -9 $server_pid 2>/dev/null
         server_pid=$no_pid

scripts/trusted_peer.test

@@ -87,8 +87,10 @@ remove_ready_file() {
 do_cleanup() {
     echo "in cleanup"
 
-    if  [ $server_pid != $no_pid ]
+    if [ $server_pid != $no_pid ] && kill -0 $server_pid
     then
+        # sleep to give sanitizers time to dump backtraces.
+        sleep 1
         echo "killing server"
         kill -9 $server_pid
     fi