X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Fstop02.sh;h=7f8a79a3d9230d74f2fa0150ee3813846bc428b2;hb=def5926f92384bf3acfcfa889e80cc167d7c5a3c;hp=93609a7f776f272bd3fcff6795835759334f6767;hpb=403ae06f9dbf8180008ccc8128f642203d41ae50;p=idzebra-moved-to-github.git

diff --git a/test/gils/stop02.sh b/test/gils/stop02.sh
index 93609a7..7f8a79a 100755
--- a/test/gils/stop02.sh
+++ b/test/gils/stop02.sh
@@ -1,49 +1,46 @@
 #!/bin/sh
-# $Id: stop02.sh,v 1.4 2003-05-21 14:39:22 adam Exp $
+# $Id: stop02.sh,v 1.8 2004-12-04 01:38:50 adam Exp $
 # test start and stop of the server with -S
-#
-# FIXME - this test does not currently pass  (H 22-oct-2002)
-# Something rotten with signals and threads and mutexes...
 
-echo "initializing"
-mkdir -p reg
-rm -f idx.log srv.log
-../../index/zebraidx -l idx.log -c zebra1.cfg init || exit 1
+pp=${srcdir:-"."}
+
+LOG=stop02.log
+
+rm -f $LOG
+echo "initializing" >>$LOG
+test -d reg || mkdir reg
+../../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
+../../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`
-rm -f zebrasrv.pid
-rm -f srv.log
-
-echo "Starting server with -S (static)..."
-../../index/zebrasrv -S -c zebra1.cfg -l srv.log tcp:@:9901 &
-sleep 1
+test -f z.pid && kill -9 `cat z.pid`
 
-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 -S (static)..." >>$LOG
+../../index/zebrasrv -D -p z.pid -S -c $pp/zebra1.cfg -l $LOG unix:socket
+echo "  checking that it runs... " >>$LOG
+test -f z.pid || sleep 2 || 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 -d 5 localhost:9901 utah > log &
+echo "  connecting again, with a delay..." >>$LOG
+../api/testclient -d 5 unix:socket utah >>$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 && exit 1
 
 # clean up
-rm -rf reg idx.log srv.log zebrasrv.pid
+rm -rf reg z.pid