X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftest2.sh;h=c99e171265c0c6abe57ec45968bb3bed56444ad0;hb=2539a52e665c013f231a61d260b7404edb9e8786;hp=9371cfe28d39e14688ce96c9f397a8c8569f7a68;hpb=403ae06f9dbf8180008ccc8128f642203d41ae50;p=idzebra-moved-to-github.git

diff --git a/test/gils/test2.sh b/test/gils/test2.sh
index 9371cfe..c99e171 100755
--- a/test/gils/test2.sh
+++ b/test/gils/test2.sh
@@ -1,87 +1,88 @@
 #!/bin/sh
-# $Id: test2.sh,v 1.6 2003-05-21 14:39:22 adam Exp $
-echo "Testing with storekeys (zebra2.cfg)"
-echo "init..."
-rm -f idx.log log
-rm -f records/esdd000[12].grs # these should not be here, will be created later
-../../index/zebraidx -l idx.log -c zebra2.cfg init || exit 1
+# $Id: test2.sh,v 1.10 2004-09-24 15:03:19 adam Exp $
 
-echo "update 1..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+pp=${srcdir:-"."}
 
-echo "update 2..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+LOG=test2.log
 
-echo "killing old server (if any)..."
+rm -f $LOG
+echo "init..." >>$LOG
+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 $pp/records || exit 1
+
+echo "update 2..." >>$LOG
+../../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`
-rm -f zebrasrv.pid
-rm -f srv.log
 
-echo "starting server..."
-../../index/zebrasrv -S -c zebra2.cfg -l srv.log tcp:@:9901 &
+echo "starting server..." >>$LOG
+../../index/zebrasrv -S -c $pp/zebra2.cfg -l $LOG tcp:@:9901 &
 sleep 1
-test -f zebrasrv.pid || exit 1
+test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
 
-echo "search 1..."
+echo "search 1..." >>$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 "update 3..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "update 3..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
-echo "search 2..."
+echo "search 2..." >>$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 "making test records..."
-cp records/esdd0006.grs records/esdd0001.grs
+echo "making test records..." >>$LOG
+cp $pp/records/esdd0006.grs $pp/records/esdd0001.grs
 
-echo "indexing them..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "indexing them..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
-echo "search 3..."
+echo "search 3..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || exit 1
-touch records/esdd0001.grs
+grep "^Result count: 10$" log >/dev/null || exit 1
+touch $pp/records/esdd0001.grs
 
-echo "indexing again..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "indexing again..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
-echo "search 4..."
+echo "search 4..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || exit 1
+grep "^Result count: 10$" log >/dev/null || exit 1
 
-echo "making another test record..."
-mv records/esdd0001.grs records/esdd0002.grs
+echo "making another test record..." >>$LOG
+mv $pp/records/esdd0001.grs $pp/records/esdd0002.grs
 
-echo "indexing it too..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "indexing it too..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.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: 10$" log || exit 1
+grep "^Result count: 10$" log >/dev/null || exit 1
 
 sleep 1
-echo "modifying a test record..."
-sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
-mv records/esdd0002x.grs records/esdd0002.grs
+echo "modifying a test record..." >>$LOG
+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..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 sleep 1
 
-echo "search 6..."
+echo "search 6..." >>$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 "search 7..."
+echo "search 7..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 xyz" > log || exit 1
-grep "^Result count: 1$" log || exit 1
+grep "^Result count: 1$" log >/dev/null || exit 1
 
-echo "stopping server..."
+echo "stopping server..." >>$LOG
 test -f zebrasrv.pid || exit 1
 kill `cat zebrasrv.pid` || exit 1
-rm -f idx.log log
-rm -f records/esdd000[12].grs 
+rm -f log
+rm -f $pp/records/esdd000[12].grs 
 rm -f zebrasrv.pid
-rm -f srv.log