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

diff --git a/test/gils/stop03.sh b/test/gils/stop03.sh
index c60f225..3b8cbe7 100755
--- a/test/gils/stop03.sh
+++ b/test/gils/stop03.sh
@@ -1,52 +1,49 @@
 #!/bin/sh
-# $Id: stop03.sh,v 1.4 2003-05-21 14:39:22 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)
-#
-# FIXME - this test does not currently pass  (H 22-oct-2002)
-# When the client exits, the process dies with a segfault
 
-echo "initializing"
+pp=${srcdir:-"."}
+
+LOG=stop03.log
+
+rm -f $LOG
+echo "initializing" >>$LOG
 mkdir -p reg
-rm -f idx.log srv.log servercrash
-../../index/zebraidx -l idx.log -c zebra1.cfg init || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
 
 #create a base to test on
-../../index/zebraidx -l idx.log -c 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 -T (threaded)..."
-(
-  ../../index/zebrasrv -T -c zebra1.cfg -l srv.log tcp:@:9901 ||
-    echo "server failed with $?" > servercrash
-)&
-sleep 1
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update records  || exit 1
+
+echo "Starting server with -T (threaded)..." >>$LOG
+../../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 z.pid && rm -f z.pid
+    exit 0
+fi
 
-echo "  checking that it runs... "
-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..."
-../api/testclient localhost:9901 utah > log || exit 1
+echo "  connecting to it..." >>$LOG
+../api/testclient localhost:9901 utah >>$LOG || exit 1
 sleep 1
 
-echo "  checking that it still runs..."
-ps -p $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 localhost:9901 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 it 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 servercrash
+rm -rf reg z.pid