X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Fstop01.sh;h=caf714b7b820ed5959d8d8f38bb8855fcfb121ae;hb=331f05f608e3d45c11adce71f767e38e173e8f40;hp=4c70b97534b91d92a723b5ef46f33cd6d1c3fe20;hpb=1c2e551dbdc6e631d19a405e2dbda45a234632f8;p=idzebra-moved-to-github.git

diff --git a/test/gils/stop01.sh b/test/gils/stop01.sh
index 4c70b97..caf714b 100755
--- a/test/gils/stop01.sh
+++ b/test/gils/stop01.sh
@@ -1,35 +1,35 @@
-# test01.sh - test start and stop of the server with -1
-#
+#!/bin/sh
+# $Id: stop01.sh,v 1.9 2004-12-04 01:48:26 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
+pp=${srcdir:-"."}
+
+LOG=stop01.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 -1 (one shot)..."
-../../index/zebrasrv -1 -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 >/dev/null || exit 1
+echo "Starting server with -1 (one shot)..." >>$LOG
+../../index/zebrasrv -D -p z.pid -1 -c $pp/zebra1.cfg -l $LOG unix:socket
+echo "  checking that it runs... " >>$LOG
+test -f z.pid || sleep 1 || 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 >/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
 
-echo ok
 # clean up
-rm -rf reg idx.log srv.log zebrasrv.pid
+rm -rf reg z.pid