X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftest1.sh;h=0c7ad8d0d7e25398595f54f640d2e04dad7a8301;hb=85ad68ab178a261dc548284ee68aae9107cbfaaf;hp=682ed786c3fa7e85a14a066ec3f038694dde3b1b;hpb=6e8c025fafc311744b5ef785238fe0a623aba6d9;p=idzebra-moved-to-github.git

diff --git a/test/gils/test1.sh b/test/gils/test1.sh
index 682ed78..0c7ad8d 100755
--- a/test/gils/test1.sh
+++ b/test/gils/test1.sh
@@ -1,54 +1,67 @@
 #!/bin/sh
-# $Id: test1.sh,v 1.10 2004-09-24 15:03:19 adam Exp $
 
-pp=${srcdir:-"."}
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
+
 
 LOG=test1.log
 
 rm -f $LOG
 echo  "initializing..." >>$LOG
 test -d reg || mkdir reg
-rm -f $pp/records/esdd000[12].grs # these should not be here, will be created later
-../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
 
-echo "updating..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update $pp/records  || 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 "killing old server (if any)..." >>$LOG
-test -f zebrasrv.pid && kill `cat zebrasrv.pid`
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg init || exit 1
+
+echo "updating..." >>$LOG
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update $srcdir/records  || exit 1
 
 echo "starting server..." >>$LOG
-../../index/zebrasrv -S -c $pp/zebra1.cfg -l $LOG tcp:@:9901 &
-sleep 1
+../../index/zebrasrv -D -p z.pid -S -c $srcdir/zebra1.cfg -l $LOG unix:socket
 
 echo "checking it runs..." >>$LOG
-test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
+test -f z.pid || exit 1
 
 echo "search 1..." >>$LOG
-../api/testclient localhost:9901 utah > log || exit 1
+../api/testclient unix:socket utah > log || exit 1
 grep "^Result count: 17$" log >/dev/null || exit 1
 
 echo "search 2..." >>$LOG
-../api/testclient localhost:9901 "@or utah the" > log || exit 1
-grep "^Result count: 40$" log >/dev/null || exit 1
+../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 localhost:9901 "@attr 1=4 the" > log || exit 1
+../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 localhost:9901 "@attr 1=4 utah" > log || exit 1
+../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 $pp/zebra1.cfg update $pp/records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update $srcdir/records || exit 1
 
 echo "search 5..." >>$LOG
-../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+../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 zebrasrv.pid || exit 1
-kill `cat zebrasrv.pid` || exit 1
-rm -f zebrasrv.pid
+test -f z.pid || exit 1
+kill `cat z.pid` || exit 1
+rm -f z.pid