projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Extended the result set system. Added support for filtering/limits.
[idzebra-moved-to-github.git]
/
test
/
gils
/
test1.sh
diff --git
a/test/gils/test1.sh
b/test/gils/test1.sh
index
d1991be
..
91572cb
100755
(executable)
--- a/
test/gils/test1.sh
+++ b/
test/gils/test1.sh
@@
-1,5
+1,5
@@
#!/bin/sh
#!/bin/sh
-# $Id: test1.sh,v 1.8 2004-06-15 08:06:34 adam Exp $
+# $Id: test1.sh,v 1.13 2005-01-03 12:08:04 adam Exp $
pp=${srcdir:-"."}
pp=${srcdir:-"."}
@@
-7,48
+7,44
@@
LOG=test1.log
rm -f $LOG
echo "initializing..." >>$LOG
rm -f $LOG
echo "initializing..." >>$LOG
-mkdir -p reg
-rm -f records/esdd000[12].grs # these should not be here, will be created later
+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 init || exit 1
echo "updating..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update records || exit 1
-
-echo "killing old server (if any)..." >>$LOG
-test -f zebrasrv.pid && kill `cat zebrasrv.pid`
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update $pp/records || exit 1
echo "starting server..." >>$LOG
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
echo "checking it runs..." >>$LOG
-test -f zebrasrv.pid || exit 1
+test -f z.pid || exit 1
echo "search 1..." >>$LOG
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
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
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
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
grep "^Result count: 9$" log >/dev/null || exit 1
echo "reindexing..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update $pp/records || exit 1
echo "search 5..." >>$LOG
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
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