X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftest1.sh;h=0c7ad8d0d7e25398595f54f640d2e04dad7a8301;hb=c00bfddbf0f3608340d61298acc61dafb167f9b2;hp=95e2aee23e0c49e75cb281f9ac286d870b4f33b1;hpb=49e78a6ad633347049dc5d61e1370a727b8b82b1;p=idzebra-moved-to-github.git

diff --git a/test/gils/test1.sh b/test/gils/test1.sh
index 95e2aee..0c7ad8d 100755
--- a/test/gils/test1.sh
+++ b/test/gils/test1.sh
@@ -1,52 +1,67 @@
-echo "testing without stored keys (zebra1.cfg)"
+#!/bin/sh
 
-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
+srcdir=${srcdir:-"."}
 
-echo "updating..."
-../../index/zebraidx -l idx.log -c zebra1.cfg update records  || exit 1
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
 
-echo "killing old server (if any)..."
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-rm -f zebrasrv.pid
-rm -f srv.log
 
-echo "starting server..."
-../../index/zebrasrv -S -c zebra1.cfg -l srv.log tcp:@:9901 &
-sleep 1
+LOG=test1.log
 
-echo "cheking it runs..."
-test -f zebrasrv.pid || exit 1
+rm -f $LOG
+echo  "initializing..." >>$LOG
+test -d reg || mkdir reg
 
-echo "search 1..."
-../testclient localhost:9901 utah > log || exit 1
-grep "^Result count: 17$" log || exit 1
+# these should not be here, will be created later
+$srcdir/cleanrecords.sh
+#if [ -f $srcdir/records/esdd0001.grs ] 
+#    then
+#    rm -f $srcdir/records/esdd0001.grs
+#fi
+#if [ -f $srcdir/records/esdd0002.grs ] 
+#    then
+#    rm -f $srcdir/records/esdd0002.grs
+#fi
 
-echo "search 2..."
-../testclient localhost:9901 "@or utah the" > log || exit 1
-grep "^Result count: 40$" log || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg init || exit 1
 
-echo "search 3..."
-../testclient localhost:9901 "@attr 1=4 the" > log || exit 1
-grep "^Result count: 1$" log || exit 1
+echo "updating..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update $srcdir/records  || exit 1
 
-echo "search 4..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 9$" log || exit 1
+echo "starting server..." >>$LOG
+../../index/zebrasrv -D -p z.pid -S -c $srcdir/zebra1.cfg -l $LOG unix:socket
 
-echo "reindexing..."
-../../index/zebraidx -l idx.log -c  zebra1.cfg update records || exit 1
+echo "checking it runs..." >>$LOG
+test -f z.pid || exit 1
 
-echo "search 5..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 18$" log || exit 1
+echo "search 1..." >>$LOG
+../api/testclient unix:socket utah > log || exit 1
+grep "^Result count: 17$" log >/dev/null || exit 1
 
-echo "stopping server..."
-test -f zebrasrv.pid || exit 1
-kill -9 `cat zebrasrv.pid` || exit 1
-rm -f zebrasrv.pid
+echo "search 2..." >>$LOG
+../api/testclient unix:socket "@or utah the" > log || exit 1
+grep "^Result count: 41$" log >/dev/null || exit 1
+
+echo "search 3..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 the" > log || exit 1
+grep "^Result count: 1$" log >/dev/null || exit 1
+
+echo "search 4..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log >/dev/null || exit 1
+
+echo "reindexing..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update $srcdir/records || exit 1
+
+echo "search 5..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 18$" log >/dev/null || exit 1
+
+echo "stopping server..." >>$LOG
+test -f z.pid || exit 1
+kill `cat z.pid` || exit 1
+rm -f z.pid
 
-echo "ok"