X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Fstop01.sh;h=edaf28e4c2710acb27383033554e9a451bcfd735;hb=339db25a87b77481458e80a2b932f7161fe597c6;hp=69013aac3cddc6728414b5640e806adc34664391;hpb=403ae06f9dbf8180008ccc8128f642203d41ae50;p=idzebra-moved-to-github.git

diff --git a/test/gils/stop01.sh b/test/gils/stop01.sh
index 69013aa..edaf28e 100755
--- a/test/gils/stop01.sh
+++ b/test/gils/stop01.sh
@@ -1,35 +1,32 @@
 #!/bin/sh
-# $Id: stop01.sh,v 1.4 2003-05-21 14:39:22 adam Exp $
+# $Id: stop01.sh,v 1.10 2005-01-02 23:21:31 adam Exp $
 # test start and stop of the server with -1
 
-echo "initializing"
-mkdir -p reg
-rm -f idx.log srv.log
-../../index/zebraidx -l idx.log -c zebra1.cfg init || exit 1
+pp=${srcdir:-"."}
 
-#create a base to test on
-../../index/zebraidx -l idx.log -c zebra1.cfg update records  || exit 1
+LOG=stop01.log
 
-#kill old server (if any)
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-rm -f zebrasrv.pid
-rm -f srv.log
+rm -f $LOG
+echo "initializing" >>$LOG
+test -d reg || mkdir reg
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
 
-echo "Starting server with -1 (one shot)..."
-../../index/zebrasrv -1 -c zebra1.cfg -l srv.log tcp:@:9901 &
-sleep 1
+#create a base to test on
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update records  || exit 1
 
-echo "  checking that it runs... "
-test -f zebrasrv.pid || exit 1
-PID=`cat zebrasrv.pid`
-ps -p $PID |grep $PID >/dev/null || exit 1
+echo "Starting server with -1 (one shot)..." >>$LOG
+../../index/zebrasrv -D -p z.pid -1 -c $pp/zebra1.cfg -l $LOG unix:socket
+echo "  checking that it runs... " >>$LOG
+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
 
-echo "  connecting to it..."
-../api/testclient localhost:9901 utah > log || exit 1
-sleep 1
+echo "  connecting to it..." >>$LOG
+../api/testclient unix:socket utah >>$LOG || exit 1
 
-echo "  checking that server does not run any more"
-ps -p $PID | grep $PID >/dev/null && exit 1
+echo "  checking that server does not run any more" >>$LOG
+kill -CHLD $PID >/dev/null 2>&1 && sleep 1 && \
+kill -CHLD $PID >/dev/null 2>&1 && exit 1
 
 # clean up
-rm -rf reg idx.log srv.log zebrasrv.pid
+rm -rf reg z.pid