X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Fstop03.sh;h=e084c9ee6fdb2ef0708bde678c75f356ac4a7f62;hb=24357780de7d01b3c3ec2c3f6715b2feee7d0e76;hp=8523036e8a103ef3e25ab5d27d2c129f97df9c6f;hpb=6cc6c9be5dd96693ad594072f6a7c16bd59e4a78;p=idzebra-moved-to-github.git diff --git a/test/gils/stop03.sh b/test/gils/stop03.sh index 8523036..e084c9e 100755 --- a/test/gils/stop03.sh +++ b/test/gils/stop03.sh @@ -1,21 +1,26 @@ #!/bin/sh -# $Id: stop03.sh,v 1.10 2005-01-03 09:19:26 adam Exp $ # test start and stop of the threaded server (-T) -pp=${srcdir:-"."} +srcdir=${srcdir:-"."} + +if [ "$srcdir" != "." ] + then + echo "Jumping over test" + exit 0 +fi LOG=stop03.log rm -f $LOG echo "initializing" >>$LOG mkdir -p reg -../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1 +../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg init || exit 1 #create a base to test on -../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update records || exit 1 +../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update records || exit 1 echo "Starting server with -T (threaded)..." >>$LOG -../../index/zebrasrv -D -p z.pid -T -c $pp/zebra1.cfg -l $LOG tcp:@:9901 2>out +../../index/zebrasrv -D -p z.pid -T -c $srcdir/zebra1.cfg -l $LOG unix:socket 2>out if grep 'not available' out >/dev/null; then test -f z.pid && rm -f z.pid @@ -30,16 +35,19 @@ echo " checking that it still runs..." >>$LOG kill -CHLD $PID >/dev/null 2>&1 || exit 1 echo " connecting to it..." >>$LOG -../api/testclient localhost:9901 utah >>$LOG || exit 1 +../api/testclient unix:socket utah >>$LOG || exit 1 sleep 1 echo " checking that it still runs..." >>$LOG kill -CHLD $PID >/dev/null 2>&1 || exit 1 echo " connecting again, with a delay..." >>$LOG -../api/testclient localhost:9901 utah 5 >>$LOG & +../api/testclient unix:socket utah 5 >>$LOG & sleep 1 # let the client connect +echo " checking that it still runs..." >>$LOG +kill -CHLD $PID >/dev/null 2>&1 || exit 1 + echo " killing it..." >>$LOG kill $PID sleep 1