X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Fstop04.sh;h=d5faf8936277acfa0ee27775a973c31f00690089;hb=85ad68ab178a261dc548284ee68aae9107cbfaaf;hp=716a786153a909988c869cb490c6585a435c2606;hpb=403ae06f9dbf8180008ccc8128f642203d41ae50;p=idzebra-moved-to-github.git

diff --git a/test/gils/stop04.sh b/test/gils/stop04.sh
index 716a786..d5faf89 100755
--- a/test/gils/stop04.sh
+++ b/test/gils/stop04.sh
@@ -1,47 +1,51 @@
 #!/bin/sh
-# $Id: stop04.sh,v 1.4 2003-05-21 14:39:22 adam Exp $
 # test start and stop of the forked server 
-#
 
-echo "initializing"
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
+
+LOG=stop04.log
+
+rm -f $LOG
+echo "initializing" >>$LOG
 mkdir -p reg
-rm -f idx.log srv.log
-../../index/zebraidx -l idx.log -c zebra1.cfg init || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg init || exit 1
 
 #create a base to test on
-../../index/zebraidx -l idx.log -c zebra1.cfg update records  || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update records  || exit 1
 
-#kill old server (if any)
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-rm -f zebrasrv.pid
-rm -f srv.log
+echo "Starting server with (forked)..." >>$LOG
+../../index/zebrasrv -D -p z.pid -c $srcdir/zebra1.cfg -l $LOG unix:socket
 
-echo "Starting server with (forked)..."
-../../index/zebrasrv  -c zebra1.cfg -l srv.log tcp:@:9901 &
-sleep 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 "  checking that it runs... " >>$LOG
+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
+echo "  connecting to it..." >>$LOG
+../api/testclient unix:socket utah >>$LOG || exit 1
 sleep 1
 
-echo "  checking that it still runs..."
-ps -p $PID | grep $PID >/dev/null || exit 1
+echo "  checking that it still runs..." >>$LOG
+kill -CHLD $PID >/dev/null 2>&1 || exit 1
 
-echo "  connecting again, with a delay..."
-../api/testclient localhost:9901 utah 5 > log &
+echo "  connecting again, with a delay..." >>$LOG
+../api/testclient unix:socket utah 5 >>$LOG
 sleep 1 # let the client connect 
 
-echo "  killing it..."
-kill  $PID
+echo "  killing it..." >>$LOG
+kill $PID
 sleep 1
 
-echo "  checking that the server is dead..."
-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 idx.log srv.log zebrasrv.pid
+rm -rf reg z.pid