X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftest2.sh;h=951c6ba79d67dd8b19888f74385485733ac33b05;hb=2147978ec217214e2fea9ca2d0a5b089fe0977f4;hp=7284db0dbce3d243e9567609354ba36c66b42e1e;hpb=d04590889450ad503a8979703370d3c7cdc7f0fc;p=idzebra-moved-to-github.git

diff --git a/test/gils/test2.sh b/test/gils/test2.sh
index 7284db0..951c6ba 100755
--- a/test/gils/test2.sh
+++ b/test/gils/test2.sh
@@ -1,86 +1,86 @@
-echo "Testing with storekeys (zebra2.cfg)"
-echo "init..."
-rm -f idx.log log
+#!/bin/sh
+# $Id: test2.sh,v 1.7 2003-05-24 22:34:48 adam Exp $
+
+LOG=test2.log
+
+rm -f $LOG
+echo "init..." >>$LOG
 rm -f records/esdd000[12].grs # these should not be here, will be created later
-../../index/zebraidx -l idx.log init || exit 1
+../../index/zebraidx -l $LOG -c zebra2.cfg init || exit 1
 
-echo "update 1..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "update 1..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "update 2..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "update 2..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "killing old server (if any)..."
+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 zebra2.cfg -l $LOG tcp:@:9901 &
 sleep 1
 test -f zebrasrv.pid || exit 1
 
-echo "search 1..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 9$" log || 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..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "update 3..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "search 2..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 9$" log || 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..."
+echo "making test records..." >>$LOG
 cp records/esdd0006.grs 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 zebra2.cfg update records || exit 1
 
-echo "search 3..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || 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
 
-echo "indexing again..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "indexing again..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 
-echo "search 4..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || 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..."
+echo "making another test record..." >>$LOG
 mv records/esdd0001.grs 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 zebra2.cfg update records || exit 1
 
-echo "search 5..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || exit 1
+echo "search 5..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 10$" log >/dev/null || exit 1
 
-echo "modifying a test record..."
+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
 
-echo "indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
 sleep 1
 
-echo "search 6..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 9$" log || exit 1
+echo "search 6..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log >/dev/null || exit 1
 
-echo "search 7..."
-../testclient localhost:9901 "@attr 1=4 xyz" > log || exit 1
-grep "^Result count: 1$" log || exit 1
+echo "search 7..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 xyz" > 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 -9 `cat zebrasrv.pid` || exit 1
-rm -f idx.log log
+kill `cat zebrasrv.pid` || exit 1
+rm -f log
 rm -f records/esdd000[12].grs 
 rm -f zebrasrv.pid
-rm -f srv.log
-
-echo ok