X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftest2.sh;h=8a13039388b4224d46fb7113a6ff001b20d26af6;hb=339db25a87b77481458e80a2b932f7161fe597c6;hp=379c66546a0586104d344cc4eeffc11bfdc6b28e;hpb=3038982ea4d46e1562a4e88029199ca09153a839;p=idzebra-moved-to-github.git

diff --git a/test/gils/test2.sh b/test/gils/test2.sh
index 379c665..8a13039 100755
--- a/test/gils/test2.sh
+++ b/test/gils/test2.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: test2.sh,v 1.8 2004-06-15 08:06:34 adam Exp $
+# $Id: test2.sh,v 1.11 2005-01-02 23:21:31 adam Exp $
 
 pp=${srcdir:-"."}
 
@@ -7,57 +7,57 @@ LOG=test2.log
 
 rm -f $LOG
 echo "init..." >>$LOG
-rm -f records/esdd000[12].grs # these should not be here, will be created later
+rm -f $pp/records/esdd000[12].grs # these should not be here, will be created later
 ../../index/zebraidx -l $LOG -c $pp/zebra2.cfg init || exit 1
 
 echo "update 1..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "update 2..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "killing old server (if any)..." >>$LOG
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
+test -f z.pid && kill -9 `cat z.pid`
 
 echo "starting server..." >>$LOG
-../../index/zebrasrv -S -c $pp/zebra2.cfg -l $LOG tcp:@:9901 &
+../../index/zebrasrv -D -p z.pid -S -c $pp/zebra2.cfg -l $LOG tcp:@:9901
 sleep 1
-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 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 9$" log >/dev/null || exit 1
 
 echo "update 3..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "search 2..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 9$" log >/dev/null || exit 1
 
 echo "making test records..." >>$LOG
-cp records/esdd0006.grs records/esdd0001.grs
+cp $pp/records/esdd0006.grs $pp/records/esdd0001.grs
 
 echo "indexing them..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "search 3..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 10$" log >/dev/null || exit 1
-touch records/esdd0001.grs
+touch $pp/records/esdd0001.grs
 
 echo "indexing again..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "search 4..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 10$" log >/dev/null || exit 1
 
 echo "making another test record..." >>$LOG
-mv records/esdd0001.grs records/esdd0002.grs
+mv $pp/records/esdd0001.grs $pp/records/esdd0002.grs
 
 echo "indexing it too..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "search 5..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
@@ -65,11 +65,11 @@ grep "^Result count: 10$" log >/dev/null || exit 1
 
 sleep 1
 echo "modifying a test record..." >>$LOG
-sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
-mv records/esdd0002x.grs records/esdd0002.grs
+sed 's/UTAH/XYZ/g' <$pp/records/esdd0002.grs >$pp/records/esdd0002x.grs
+mv $pp/records/esdd0002x.grs $pp/records/esdd0002.grs
 
 echo "indexing it..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 sleep 1
 
 echo "search 6..." >>$LOG
@@ -81,8 +81,8 @@ echo "search 7..." >>$LOG
 grep "^Result count: 1$" log >/dev/null || exit 1
 
 echo "stopping server..." >>$LOG
-test -f zebrasrv.pid || exit 1
-kill `cat zebrasrv.pid` || exit 1
+test -f z.pid || exit 1
+kill `cat z.pid` || exit 1
 rm -f log
-rm -f records/esdd000[12].grs 
-rm -f zebrasrv.pid
+rm -f $pp/records/esdd000[12].grs 
+rm -f z.pid