X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Fstop01.sh;h=c91e76afb9054dc3fb1371edce0be1797bf5819c;hb=a9eae0225b1a51b0257f80d9da9f95475dd04f53;hp=f1b52c17be2a9de4d8346f78df139e4a00654672;hpb=e93e9d110b6bb2596e011de5fb0c8825ac2fe2b2;p=idzebra-moved-to-github.git

diff --git a/test/gils/stop01.sh b/test/gils/stop01.sh
index f1b52c1..c91e76a 100755
--- a/test/gils/stop01.sh
+++ b/test/gils/stop01.sh
@@ -1,36 +1,36 @@
 #!/bin/sh
-# $Id: stop01.sh,v 1.2 2003-05-06 17:39:01 adam Exp $
+# $Id: stop01.sh,v 1.7 2004-09-24 15:03:19 adam Exp $
 # test start and stop of the server with -1
 
-echo "initializing"
+pp=${srcdir:-"."}
+
+LOG=stop01.log
+
+rm -f $LOG
+echo "initializing" >>$LOG
 mkdir -p reg
-rm -f idx.log srv.log
-../../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
+../../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 &
+echo "Starting server with -1 (one shot)..." >>$LOG
+../../index/zebrasrv -1 -c $pp/zebra1.cfg -l $LOG tcp:@:9901 &
 sleep 1
-
-echo "  checking that it runs... "
-test -f zebrasrv.pid || exit 1
+echo "  checking that it runs... " >>$LOG
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
 PID=`cat zebrasrv.pid`
-ps -p $PID >/dev/null || exit 1
+ps -p $PID |grep $PID >/dev/null || exit 1
 
-echo "  connecting to it..."
-../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 server does not run any more"
-ps -p $PID >/dev/null && exit 1
+echo "  checking that server does not run any more" >>$LOG
+ps -p $PID | grep $PID >/dev/null && exit 1
 
-echo ok
 # clean up
-rm -rf reg idx.log srv.log zebrasrv.pid
+rm -rf reg zebrasrv.pid