From: Adam Dickmeiss Date: Mon, 14 Jun 2004 23:45:11 +0000 (+0000) Subject: Prepare for srcdir != builddir in tests X-Git-Tag: ZEBRA.1.3.16~48 X-Git-Url: http://sru.miketaylor.org.uk/cgi-bin?a=commitdiff_plain;h=965edd26d5f3cb170e8a02fee134bc19c9c615f4;p=idzebra-moved-to-github.git Prepare for srcdir != builddir in tests --- diff --git a/test/gils/stop01.sh b/test/gils/stop01.sh index 92f7322..3bd6238 100755 --- a/test/gils/stop01.sh +++ b/test/gils/stop01.sh @@ -1,22 +1,24 @@ #!/bin/sh -# $Id: stop01.sh,v 1.5 2003-05-24 22:34:48 adam Exp $ +# $Id: stop01.sh,v 1.6 2004-06-14 23:45:11 adam Exp $ # test start and stop of the server with -1 +pp=${srcdir:-"."} + LOG=stop01.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 -1 (one shot)..." >>$LOG -../../index/zebrasrv -1 -c zebra1.cfg -l $LOG tcp:@:9901 & +../../index/zebrasrv -1 -c $pp/zebra1.cfg -l $LOG tcp:@:9901 & sleep 1 echo " checking that it runs... " >>$LOG diff --git a/test/gils/stop02.sh b/test/gils/stop02.sh index a797787..d6216bf 100755 --- a/test/gils/stop02.sh +++ b/test/gils/stop02.sh @@ -1,22 +1,24 @@ #!/bin/sh -# $Id: stop02.sh,v 1.5 2003-05-24 22:34:48 adam Exp $ +# $Id: stop02.sh,v 1.6 2004-06-14 23:45:11 adam Exp $ # test start and stop of the server with -S +pp=${srcdir:-"."} + LOG=stop02.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 -S (static)..." >>$LOG -../../index/zebrasrv -S -c zebra1.cfg -l $LOG tcp:@:9901 & +../../index/zebrasrv -S -c $pp/zebra1.cfg -l $LOG tcp:@:9901 & sleep 1 echo " checking that it runs... " >>$LOG