X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftest2.sh;h=2b57e2eaa0db80bd146c9fef059501f9fe5e7abb;hb=85ad68ab178a261dc548284ee68aae9107cbfaaf;hp=ef5166694ae8cfa14960d8a9240dfa95c7777566;hpb=49e78a6ad633347049dc5d61e1370a727b8b82b1;p=idzebra-moved-to-github.git

diff --git a/test/gils/test2.sh b/test/gils/test2.sh
index ef51666..2b57e2e 100755
--- a/test/gils/test2.sh
+++ b/test/gils/test2.sh
@@ -1,85 +1,95 @@
-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 init || exit 1
+#!/bin/sh
 
-echo "update 1..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+srcdir=${srcdir:-"."}
 
-echo "update 2..."
-../../index/zebraidx -l idx.log -c zebra2.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
+LOG=test2.log
 
-echo "starting server..."
-../../index/zebrasrv -S -c zebra2.cfg -l srv.log tcp:@:9901 &
-sleep 1
-test -f zebrasrv.pid || exit 1
+rm -f $LOG
+echo "init..." >>$LOG
+
+# these should not be here, will be created later
+$srcdir/cleanrecords.sh
+
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg init || exit 1
+
+echo "update 1..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
-echo "search 1..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 9$" log || exit 1
+echo "update 2..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
-echo "update 3..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "killing old server (if any)..." >>$LOG
+test -f z.pid && kill -9 `cat z.pid`
 
-echo "search 2..."
-../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/zebra2.cfg -l $LOG unix:socket
+test -f z.pid || exit 1
 
-echo "making test records..."
-cp records/esdd0006.grs records/esdd0001.grs
+echo "search 1..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log >/dev/null || exit 1
 
-echo "indexing them..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "update 3..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
-echo "search 3..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || exit 1
-touch records/esdd0001.grs
+echo "search 2..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log >/dev/null || exit 1
 
-echo "indexing again..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "making test records..." >>$LOG
+cp $srcdir/records/esdd0006.grs $srcdir/records/esdd0001.grs
 
-echo "search 4..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || exit 1
+echo "indexing them..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
-echo "making another test record..."
-mv records/esdd0001.grs records/esdd0002.grs
+echo "search 3..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 10$" log >/dev/null || exit 1
+touch $srcdir/records/esdd0001.grs
 
-echo "indexing it too..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "indexing again..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/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 4..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 10$" log >/dev/null || exit 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 "making another test record..." >>$LOG
+mv $srcdir/records/esdd0001.grs $srcdir/records/esdd0002.grs
 
-echo "indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "indexing it too..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
-echo "search 6..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 9$" log || exit 1
+echo "search 5..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 10$" log >/dev/null || exit 1
+
+sleep 1
+echo "modifying a test record..." >>$LOG
+sed 's/UTAH/XYZ/g' <$srcdir/records/esdd0002.grs >$srcdir/records/esdd0002x.grs
+mv $srcdir/records/esdd0002x.grs $srcdir/records/esdd0002.grs
+
+echo "indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
+sleep 1
 
-echo "search 7..."
-../testclient localhost:9901 "@attr 1=4 xyz" > log || exit 1
-grep "^Result count: 1$" log || exit 1
+echo "search 6..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log >/dev/null || exit 1
 
-echo "stopping server..."
-test -f zebrasrv.pid || exit 1
-kill -9 `cat zebrasrv.pid` || exit 1
-rm -f idx.log log
-rm -f records/esdd000[12].grs 
-rm -f zebrasrv.pid
-rm -f srv.log
+echo "search 7..." >>$LOG
+../api/testclient unix:socket "@attr 1=4 xyz" > log || exit 1
+grep "^Result count: 1$" log >/dev/null || exit 1
 
-echo ok
+echo "stosrcdiring server..." >>$LOG
+test -f z.pid || exit 1
+kill `cat z.pid` || exit 1
+rm -f log
+$srcdir/cleanrecords.sh
+rm -f z.pid