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

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