diff options
| author |   inoguchi <inoguchi@openbsd.org> | 2018-08-26 13:28:13 +0000 |
|---|---|---|
| committer | inoguchi <inoguchi@openbsd.org> | 2018-08-26 13:28:13 +0000 |
| commit | 32fc3c00f0833491a3aa45343ef03a266f04eae4 (patch) | |
| tree | f72c565cf8f9700bffd63f29c6cb1f968ae10295 | |
| parent | Add q: format prefix to escape sh(1) special characters. Suggested by (diff) | |
| download | wireguard-openbsd-32fc3c00f0833491a3aa45343ef03a266f04eae4.tar.xz wireguard-openbsd-32fc3c00f0833491a3aa45343ef03a266f04eae4.zip | |
Stop s_server if error occurs in regress appstest.sh
| -rwxr-xr-x | regress/usr.bin/openssl/appstest.sh | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/regress/usr.bin/openssl/appstest.sh b/regress/usr.bin/openssl/appstest.sh index a933c399b21..69b3d4b8f77 100755 --- a/regress/usr.bin/openssl/appstest.sh +++ b/regress/usr.bin/openssl/appstest.sh @@ -1,6 +1,6 @@ #!/bin/sh # -# $OpenBSD: appstest.sh,v 1.7 2018/08/23 15:16:21 inoguchi Exp $ +# $OpenBSD: appstest.sh,v 1.8 2018/08/26 13:28:13 inoguchi Exp $ # # Copyright (c) 2016 Kinichiro Inoguchi <inoguchi@openbsd.org> # @@ -45,9 +45,20 @@ function start_message { echo "[TEST] $1" } +function stop_s_server { + if [ ! -z "$s_server_pid" ] ; then + echo ":-| stop s_server [ $s_server_pid ]" + sleep 1 + kill -TERM $s_server_pid + wait $s_server_pid + s_server_pid= + fi +} + function check_exit_status { status=$1 if [ $status -ne 0 ] ; then + stop_s_server echo ":-< error occurs, exit status = [ $status ]" exit $status else @@ -994,9 +1005,7 @@ start_message "sess_id" $openssl_bin sess_id -in $sess_dat -text -out $sess_dat.out check_exit_status $? -sleep 1 -kill -TERM $s_server_pid -wait $s_server_pid +stop_s_server #---------#---------#---------#---------#---------#---------#---------#--------- |