X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fgils%2Fstop03.sh;h=e084c9ee6fdb2ef0708bde678c75f356ac4a7f62;hp=a057327f23e9c0c3dfdeff124a324e82df545891;hb=c00bfddbf0f3608340d61298acc61dafb167f9b2;hpb=2147978ec217214e2fea9ca2d0a5b089fe0977f4

diff --git a/test/gils/stop03.sh b/test/gils/stop03.sh
index a057327..e084c9e 100755
--- a/test/gils/stop03.sh
+++ b/test/gils/stop03.sh
@@ -1,49 +1,60 @@
 #!/bin/sh
-# $Id: stop03.sh,v 1.5 2003-05-24 22:34:48 adam Exp $
 # test start and stop of the threaded server (-T)
 
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
+
 LOG=stop03.log
 
 rm -f $LOG
 echo "initializing" >>$LOG
 mkdir -p reg
-../../index/zebraidx -l $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 $LOG -c zebra1.cfg update records  || exit 1
-
-#kill old server (if any)
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update records  || exit 1
 
 echo "Starting server with -T (threaded)..." >>$LOG
-(
-  ../../index/zebrasrv -T -c zebra1.cfg -l $LOG tcp:@:9901 ||
-    echo "server failed with $?" > $LOG
-)&
-sleep 1
+../../index/zebrasrv -D -p z.pid -T -c $srcdir/zebra1.cfg -l $LOG unix:socket 2>out
+
+if grep 'not available' out >/dev/null; then
+    test -f z.pid && rm -f z.pid
+    exit 0
+fi
 
-echo "  checking that it runs... " >>$LOG
-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`
+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
+../api/testclient unix:socket 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 &
+../api/testclient unix:socket utah 5 >>$LOG &
 sleep 1 # let the client connect 
 
+echo "  checking that it still runs..." >>$LOG
+kill -CHLD $PID >/dev/null 2>&1 || exit 1
+
 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