Refine test and make it more portable.

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

diff --git a/test/gils/stop03.sh b/test/gils/stop03.sh
index a057327..e2ab9fc 100755 (executable)
--- a/test/gils/stop03.sh
+++ b/test/gils/stop03.sh
@@ -1,29 +1,35 @@
 #!/bin/sh
-# $Id: stop03.sh,v 1.5 2003-05-24 22:34:48 adam Exp $
+# $Id: stop03.sh,v 1.8 2004-09-24 15:03:19 adam Exp $
 # test start and stop of the threaded server (-T)
 
+pp=${srcdir:-"."}
+
 LOG=stop03.log
 
 rm -f $LOG
 echo "initializing" >>$LOG
 mkdir -p reg
-../../index/zebraidx -l $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 $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`
 
 echo "Starting server with -T (threaded)..." >>$LOG
 (
-  ../../index/zebrasrv -T -c zebra1.cfg -l $LOG tcp:@:9901 ||
+  ../../index/zebrasrv -T -c $pp/zebra1.cfg -l $LOG tcp:@:9901 2>out ||
     echo "server failed with $?" > $LOG
 )&
 sleep 1
 
+if grep 'not available' out >/dev/null; then
+    test -f zebrasrv.pid && rm zebrasrv.pid
+    exit 0
+fi
 echo "  checking that it runs... " >>$LOG
-test -f zebrasrv.pid || exit 1
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
 PID=`cat zebrasrv.pid`
 ps -p $PID | grep $PID >/dev/null || exit 1