X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Fstop02.sh;h=37a20db09491d991c74f02e451fbe3d1f0d5ed81;hb=339db25a87b77481458e80a2b932f7161fe597c6;hp=7f8a79a3d9230d74f2fa0150ee3813846bc428b2;hpb=def5926f92384bf3acfcfa889e80cc167d7c5a3c;p=idzebra-moved-to-github.git

diff --git a/test/gils/stop02.sh b/test/gils/stop02.sh
index 7f8a79a..37a20db 100755
--- a/test/gils/stop02.sh
+++ b/test/gils/stop02.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: stop02.sh,v 1.8 2004-12-04 01:38:50 adam Exp $
+# $Id: stop02.sh,v 1.10 2005-01-02 23:21:31 adam Exp $
 # test start and stop of the server with -S
 
 pp=${srcdir:-"."}
@@ -14,13 +14,10 @@ test -d reg || mkdir reg
 #create a base to test on
 ../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update records  || exit 1
 
-#kill old server (if any)
-test -f z.pid && kill -9 `cat z.pid`
-
 echo "Starting server with -S (static)..." >>$LOG
 ../../index/zebrasrv -D -p z.pid -S -c $pp/zebra1.cfg -l $LOG unix:socket
 echo "  checking that it runs... " >>$LOG
-test -f z.pid || sleep 2 || test -f z.pid || exit 1
+test -f z.pid || sleep 1 || test -f z.pid || exit 1
 PID=`cat z.pid`
 kill -CHLD $PID >/dev/null 2>&1 || exit 1
 
@@ -38,8 +35,8 @@ sleep 1 # let the client connect
 echo "  killing it..." >>$LOG
 kill $PID
 
-sleep 1
 echo "  checking that it is dead..." >>$LOG
+kill -CHLD $PID >/dev/null 2>&1 && sleep 1 && \
 kill -CHLD $PID >/dev/null 2>&1 && exit 1
 
 # clean up