X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fgils%2Fstop03.sh;h=3b8cbe75e7ebfbcf19af1ecb6fef641d1d958264;hp=e2ab9fcee7895bdc6d877290e0a490e055eda40f;hb=339db25a87b77481458e80a2b932f7161fe597c6;hpb=a7138d8cfaa70cfe8d2e7ab4cc05cb5bbe7a7639

diff --git a/test/gils/stop03.sh b/test/gils/stop03.sh
index e2ab9fc..3b8cbe7 100755
--- a/test/gils/stop03.sh
+++ b/test/gils/stop03.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: stop03.sh,v 1.8 2004-09-24 15:03:19 adam Exp $
+# $Id: stop03.sh,v 1.9 2005-01-02 23:21:31 adam Exp $
 # test start and stop of the threaded server (-T)
 
 pp=${srcdir:-"."}
@@ -14,31 +14,24 @@ mkdir -p 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 zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-
 echo "Starting server with -T (threaded)..." >>$LOG
-(
-  ../../index/zebrasrv -T -c $pp/zebra1.cfg -l $LOG tcp:@:9901 2>out ||
-    echo "server failed with $?" > $LOG
-)&
-sleep 1
+../../index/zebrasrv -D -p z.pid -T -c $pp/zebra1.cfg -l $LOG tcp:@:9901 2>out
 
 if grep 'not available' out >/dev/null; then
-    test -f zebrasrv.pid && rm zebrasrv.pid
+    test -f z.pid && rm -f z.pid
     exit 0
 fi
-echo "  checking that it runs... " >>$LOG
-test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
-PID=`cat zebrasrv.pid`
-ps -p $PID | grep $PID >/dev/null || exit 1
+
+PID=`cat z.pid`
+echo "  checking that it still runs..." >>$LOG
+kill -CHLD $PID >/dev/null 2>&1 || exit 1
 
 echo "  connecting to it..." >>$LOG
 ../api/testclient localhost:9901 utah >>$LOG || exit 1
 sleep 1
 
 echo "  checking that it still runs..." >>$LOG
-ps -p $PID >/dev/null || exit 1
+kill -CHLD $PID >/dev/null 2>&1 || exit 1
 
 echo "  connecting again, with a delay..." >>$LOG
 ../api/testclient localhost:9901 utah 5 >>$LOG &
@@ -48,8 +41,9 @@ echo "  killing it..." >>$LOG
 kill $PID
 sleep 1
 
-echo "  checking that it is dead" >>$LOG
-ps -p $PID | grep $PID >/dev/null && exit 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
-rm -rf reg zebrasrv.pid
+rm -rf reg z.pid