Moved the test sequences (old t[1-8].sh) into more consistent scripts

diff --git a/test/gils/Makefile.am b/test/gils/Makefile.am
index 0b1075a..657773f 100644 (file)
--- a/test/gils/Makefile.am
+++ b/test/gils/Makefile.am
@@ -6,4 +6,5 @@ dist-hook:
        -mkdir $(distdir)/records
        cp $(srcdir)/records/*.grs $(distdir)/records
 
-TESTS = t1.sh t2.sh t3.sh t4.sh t5.sh t6.sh t7.sh t8.sh
+#TESTS = t1.sh t2.sh t3.sh t4.sh t5.sh t6.sh t7.sh t8.sh
+TESTS = test1.sh test2.sh

diff --git a/test/gils/test1.sh b/test/gils/test1.sh
new file mode 100755 (executable)
index 0000000..95e2aee
--- /dev/null
+++ b/test/gils/test1.sh
@@ -0,0 +1,52 @@
+echo "testing without stored keys (zebra1.cfg)"
+
+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
+
+echo "updating..."
+../../index/zebraidx -l idx.log -c zebra1.cfg update records  || exit 1
+
+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
+
+echo "cheking it runs..."
+test -f zebrasrv.pid || exit 1
+
+echo "search 1..."
+../testclient localhost:9901 utah > log || exit 1
+grep "^Result count: 17$" log || exit 1
+
+echo "search 2..."
+../testclient localhost:9901 "@or utah the" > log || exit 1
+grep "^Result count: 40$" log || exit 1
+
+echo "search 3..."
+../testclient localhost:9901 "@attr 1=4 the" > log || exit 1
+grep "^Result count: 1$" log || exit 1
+
+echo "search 4..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log || exit 1
+
+echo "reindexing..."
+../../index/zebraidx -l idx.log -c  zebra1.cfg update records || exit 1
+
+echo "search 5..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 18$" log || exit 1
+
+echo "stopping server..."
+test -f zebrasrv.pid || exit 1
+kill -9 `cat zebrasrv.pid` || exit 1
+rm -f zebrasrv.pid
+
+echo "ok"

diff --git a/test/gils/test2.sh b/test/gils/test2.sh
new file mode 100755 (executable)
index 0000000..ef51666
--- /dev/null
+++ b/test/gils/test2.sh
@@ -0,0 +1,85 @@
+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
+
+echo "update 1..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "update 2..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+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 zebra2.cfg -l srv.log tcp:@:9901 &
+sleep 1
+test -f zebrasrv.pid || exit 1
+
+echo "search 1..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log || exit 1
+
+echo "update 3..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "search 2..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 9$" log || exit 1
+
+echo "making test records..."
+cp records/esdd0006.grs records/esdd0001.grs
+
+echo "indexing them..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update 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 "indexing again..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "search 4..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 10$" log || exit 1
+
+echo "making another test record..."
+mv records/esdd0001.grs records/esdd0002.grs
+
+echo "indexing it too..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+
+echo "search 5..."
+../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+grep "^Result count: 10$" log || 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 "indexing it..."
+../../index/zebraidx -l idx.log -c zebra2.cfg update 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 7..."
+../testclient localhost:9901 "@attr 1=4 xyz" > log || exit 1
+grep "^Result count: 1$" log || 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 ok