Omit CVS Id. Update copyright year.

[idzebra-moved-to-github.git] / test / gils / stop01.sh

diff --git a/test/gils/stop01.sh b/test/gils/stop01.sh
index 41681a6..6c2b2a4 100755 (executable)
--- a/test/gils/stop01.sh
+++ b/test/gils/stop01.sh
@@ -1,35 +1,37 @@
 #!/bin/sh
-# $Id: stop01.sh,v 1.3 2003-05-06 20:09:28 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
+srcdir=${srcdir:-"."}
 
-#create a base to test on
-../../index/zebraidx -l idx.log -c zebra1.cfg update records  || exit 1
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
+
+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 $srcdir/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 $srcdir/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 $srcdir/zebra1.cfg -l $LOG unix:socket
+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..."
-../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