X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftest1.sh;h=666284f2c1cff20b01f0aa2cc458fc0336c699f1;hb=339db25a87b77481458e80a2b932f7161fe597c6;hp=5ee2b2309685faf0ae3103c6030f3f6b4165210f;hpb=2147978ec217214e2fea9ca2d0a5b089fe0977f4;p=idzebra-moved-to-github.git

diff --git a/test/gils/test1.sh b/test/gils/test1.sh
index 5ee2b23..666284f 100755
--- a/test/gils/test1.sh
+++ b/test/gils/test1.sh
@@ -1,26 +1,25 @@
 #!/bin/sh
-# $Id: test1.sh,v 1.7 2003-05-24 22:34:48 adam Exp $
+# $Id: test1.sh,v 1.11 2005-01-02 23:21:31 adam Exp $
+
+pp=${srcdir:-"."}
 
 LOG=test1.log
 
 rm -f $LOG
 echo  "initializing..." >>$LOG
-mkdir -p reg
-rm -f records/esdd000[12].grs # these should not be here, will be created later
-../../index/zebraidx -l $LOG -c zebra1.cfg init || exit 1
+test -d reg || mkdir reg
+rm -f $pp/records/esdd000[12].grs # these should not be here, will be created later
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
 
 echo "updating..." >>$LOG
-../../index/zebraidx -l $LOG -c zebra1.cfg update records  || exit 1
-
-echo "killing old server (if any)..." >>$LOG
-test -f zebrasrv.pid && kill `cat zebrasrv.pid`
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update $pp/records  || exit 1
 
 echo "starting server..." >>$LOG
-../../index/zebrasrv -S -c zebra1.cfg -l $LOG tcp:@:9901 &
+../../index/zebrasrv -D -p z.pid -S -c $pp/zebra1.cfg -l $LOG tcp:@:9901
 sleep 1
 
 echo "checking it runs..." >>$LOG
-test -f zebrasrv.pid || exit 1
+test -f z.pid || sleep 5 || test -f z.pid || exit 1
 
 echo "search 1..." >>$LOG
 ../api/testclient localhost:9901 utah > log || exit 1
@@ -39,14 +38,14 @@ echo "search 4..." >>$LOG
 grep "^Result count: 9$" log >/dev/null || exit 1
 
 echo "reindexing..." >>$LOG
-../../index/zebraidx -l $LOG -c  zebra1.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update $pp/records || exit 1
 
 echo "search 5..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 18$" log >/dev/null || exit 1
 
 echo "stopping server..." >>$LOG
-test -f zebrasrv.pid || exit 1
-kill `cat zebrasrv.pid` || exit 1
-rm -f zebrasrv.pid
+test -f z.pid || exit 1
+kill `cat z.pid` || exit 1
+rm -f z.pid