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

diff --git a/test/gils/test1.sh b/test/gils/test1.sh
index 682ed78..91572cb 100755
--- a/test/gils/test1.sh
+++ b/test/gils/test1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: test1.sh,v 1.10 2004-09-24 15:03:19 adam Exp $
+# $Id: test1.sh,v 1.13 2005-01-03 12:08:04 adam Exp $
 
 pp=${srcdir:-"."}
 
@@ -14,41 +14,37 @@ rm -f $pp/records/esdd000[12].grs # these should not be here, will be created la
 echo "updating..." >>$LOG
 ../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update $pp/records  || exit 1
 
-echo "killing old server (if any)..." >>$LOG
-test -f zebrasrv.pid && kill `cat zebrasrv.pid`
-
 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 $pp/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
+../api/testclient unix:socket "@or utah the" > log || exit 1
 grep "^Result count: 40$" 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
 
 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