From 7e78c293a97239f895b862836c65c4b755abdc52 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sun, 31 Mar 2024 19:53:16 +0200 Subject: Test suite: clean up scripts - Reformat code. - Cleanup some glitches, streamline scripts ... - Enable "set -u": Error on unset variables. - Detect "$srcdir" in prep-server3 script, too. --- src/testsuite/reload-server.sh | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/testsuite/reload-server.sh') diff --git a/src/testsuite/reload-server.sh b/src/testsuite/reload-server.sh index 1f82d8eb..8d6fd2bc 100755 --- a/src/testsuite/reload-server.sh +++ b/src/testsuite/reload-server.sh @@ -1,10 +1,11 @@ #!/bin/sh # ngIRCd Test Suite -[ -z "$srcdir" ] && srcdir=`dirname $0` +[ -z "$srcdir" ] && srcdir=`dirname "$0"` +set -u # read in functions -. ${srcdir}/functions.inc +. "${srcdir}/functions.inc" if [ -n "$1" ]; then id="$1"; shift @@ -17,16 +18,14 @@ echo_n "reloading server ${id} ..." # reload (sighup) test-server ... pid=`./getpid.sh T-ngircd${id}` if [ -z "$pid" ]; then - echo " failure: no running server found!?" - exit 1 + echo " failure: no running server found!?" + exit 1 fi -kill -HUP $pid > /dev/null 2>&1; r=$? +kill -HUP $pid >/dev/null 2>&1; r=$? if [ $r -eq 0 ]; then - sleep 2 - echo " ok". - kill -0 $pid && exit 0 + sleep 2 + echo " ok". + kill -0 $pid && exit 0 fi echo " failure: server ${id} could not be reloaded!" exit 1 - -# -eof- -- cgit 1.4.1