From 0f4ea4b1335e491695773bf51c6e4af72a007fa3 Mon Sep 17 00:00:00 2001 From: Heikki Levanto Date: Tue, 22 Oct 2002 10:09:04 +0000 Subject: [PATCH] Testing with isam b. Added echos in test scripts to see what is happening --- test/gils/t1.sh | 8 ++++++-- test/gils/t2.sh | 4 ++++ test/gils/t3.sh | 15 ++++++++++++++ test/gils/t4.sh | 3 +++ test/gils/t5.sh | 7 +++++++ test/gils/t6.sh | 3 +++ test/gils/t7.sh | 56 +++++++++++++++++++++++++++++++++++++++----------- test/gils/t8.sh | 3 +++ test/gils/zebra.cfg | 5 +++-- test/gils/zebra1.cfg | 8 ++++++-- test/gils/zebra2.cfg | 5 +++-- 11 files changed, 97 insertions(+), 20 deletions(-) diff --git a/test/gils/t1.sh b/test/gils/t1.sh index 56f0746..4ad77bf 100755 --- a/test/gils/t1.sh +++ b/test/gils/t1.sh @@ -1,3 +1,7 @@ -../../index/zebraidx -l idx.log init || exit 1 -rm -f records/esdd000[12].grs +echo "initializing..." +mkdir -p reg +../../index/zebraidx -l idx.log -c zebra1.cfg init || exit 1 +rm -f records/esdd000[12].grs # these should not be here, will be created later +echo "updating..." ../../index/zebraidx -l idx.log -c zebra1.cfg update records || exit 2 +echo "ok" diff --git a/test/gils/t2.sh b/test/gils/t2.sh index 07ae40b..2e9b343 100755 --- a/test/gils/t2.sh +++ b/test/gils/t2.sh @@ -1,6 +1,10 @@ +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 "ok" diff --git a/test/gils/t3.sh b/test/gils/t3.sh index da14c99..dcd33e7 100755 --- a/test/gils/t3.sh +++ b/test/gils/t3.sh @@ -1,12 +1,27 @@ +echo "Checking taht server runs..." test -f zebrasrv.pid || exit 1 + +echo "search 1..." ../../../yaz/zoom/zoomtst1 localhost:9901 utah > log || exit 3 grep "^Result count: 17$" log || exit 4 + +echo "search 2..." ../../../yaz/zoom/zoomtst1 localhost:9901 "@or utah the" > log || exit 5 grep "^Result count: 40$" log || exit 6 + +echo "search 3..." ../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 the" > log || exit 7 grep "^Result count: 1$" log || exit 8 + +echo "search 4..." ../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 9 grep "^Result count: 9$" log || exit 10 + +echo "reindexing..." ../../index/zebraidx -l idx.log -c zebra1.cfg update records || exit 11 + +echo "search 5..." ../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 12 grep "^Result count: 18$" log || exit 14 + +echo "ok" diff --git a/test/gils/t4.sh b/test/gils/t4.sh index 87903a2..da2cbcf 100755 --- a/test/gils/t4.sh +++ b/test/gils/t4.sh @@ -1,2 +1,5 @@ +echo "stopping server..." test -f zebrasrv.pid || exit 1 kill -9 `cat zebrasrv.pid` || exit 2 + +echo "ok" diff --git a/test/gils/t5.sh b/test/gils/t5.sh index 3801167..f1e3f29 100755 --- a/test/gils/t5.sh +++ b/test/gils/t5.sh @@ -1,4 +1,11 @@ rm -f idx.log +echo "init..." ../../index/zebraidx -l idx.log init || exit 1 + +echo "update 1..." ../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 2 + +echo "update 2..." ../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 2 + +echo ok diff --git a/test/gils/t6.sh b/test/gils/t6.sh index 34a4028..d75d187 100755 --- a/test/gils/t6.sh +++ b/test/gils/t6.sh @@ -1,5 +1,8 @@ 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 ok diff --git a/test/gils/t7.sh b/test/gils/t7.sh index 7cf2c10..cffde93 100755 --- a/test/gils/t7.sh +++ b/test/gils/t7.sh @@ -1,26 +1,58 @@ +echo "checking server is running..." test -f zebrasrv.pid || exit 1 + +echo "search 1..." ../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 2 grep "^Result count: 9$" log || exit 1 -../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 2 -../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 2 + +echo "indexing records..." +../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 3 + +echo "search 2..." +../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 4 grep "^Result count: 9$" log || exit 1 + +echo "making test records..." cp records/esdd0006.grs records/esdd0001.grs -../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 2 -../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 2 + +echo "indexing them..." +../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 5 + +echo "search 3..." +../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 6 grep "^Result count: 10$" log || exit 1 touch records/esdd0001.grs -../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 2 -../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 2 + +echo "indexing again..." +../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 7 + +echo "search 4..." +../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 8 grep "^Result count: 10$" log || exit 1 + +echo "making another test record..." mv records/esdd0001.grs records/esdd0002.grs -../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 2 -../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 2 + +echo "indexing it too..." +../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 9 + +echo "search 5..." +../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 10 grep "^Result count: 10$" log || exit 1 -sleep 1 + +echo "modifying a test record..." sed 's/UTAH/XYZ/g' records/esdd0002x.grs mv records/esdd0002x.grs records/esdd0002.grs -../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 2 -../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 2 + +echo "indexing it..." +../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 11 + +echo "search 6..." +../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 utah" > log || exit 12 grep "^Result count: 9$" log || exit 1 -../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 xyz" > log || exit 2 + +echo "search 7..." +../../../yaz/zoom/zoomtst1 localhost:9901 "@attr 1=4 xyz" > log || exit 13 grep "^Result count: 1$" log || exit 1 + +echo ok diff --git a/test/gils/t8.sh b/test/gils/t8.sh index 331643c..6df5aa8 100755 --- a/test/gils/t8.sh +++ b/test/gils/t8.sh @@ -1,2 +1,5 @@ +echo "stopping server..." test -f zebrasrv.pid || exit 1 kill `cat zebrasrv.pid` || exit 2 + +echo ok diff --git a/test/gils/zebra.cfg b/test/gils/zebra.cfg index a0a7e95..d99a081 100644 --- a/test/gils/zebra.cfg +++ b/test/gils/zebra.cfg @@ -1,5 +1,5 @@ # Simple Zebra configuration file -# $Id: zebra.cfg,v 1.18 2002-10-03 10:16:24 adam Exp $ +# $Id: zebra.cfg,v 1.19 2002-10-22 10:09:04 heikki Exp $ # # Where the schema files, attribute files, etc are located. profilePath: .:../../tab:../../../yaz/tab:/usr/local/share/yaz/tab:/usr/share/yaz/tab @@ -14,4 +14,5 @@ recordtype: grs.sgml #storekeys: 1 #storedata: 1 #recordId: (bib1,identifier-standard) -isam: c +isam: b +register: reg:20M diff --git a/test/gils/zebra1.cfg b/test/gils/zebra1.cfg index 678257a..b268670 100644 --- a/test/gils/zebra1.cfg +++ b/test/gils/zebra1.cfg @@ -1,5 +1,5 @@ # Simple Zebra configuration file -# $Id: zebra1.cfg,v 1.2 2002-10-03 10:16:24 adam Exp $ +# $Id: zebra1.cfg,v 1.3 2002-10-22 10:09:04 heikki Exp $ # # Where the schema files, attribute files, etc are located. profilePath: .:../../tab:../../../yaz/tab:/usr/local/share/yaz/tab:/usr/share/yaz/tab @@ -11,4 +11,8 @@ attset: explain.att recordtype: grs.sgml -isam: c +#storekeys: 1 +#storedata: 1 +#recordId: (bib1,identifier-standard) +isam: b +register: reg:20M diff --git a/test/gils/zebra2.cfg b/test/gils/zebra2.cfg index b0a717e..28e1271 100644 --- a/test/gils/zebra2.cfg +++ b/test/gils/zebra2.cfg @@ -1,5 +1,5 @@ # Simple Zebra configuration file -# $Id: zebra2.cfg,v 1.2 2002-10-03 10:16:24 adam Exp $ +# $Id: zebra2.cfg,v 1.3 2002-10-22 10:09:04 heikki Exp $ # # Where the schema files, attribute files, etc are located. profilePath: .:../../tab:../../../yaz/tab:/usr/local/share/yaz/tab:/usr/share/yaz/tab @@ -15,4 +15,5 @@ storeData: 1 storeKeys: 1 recordId: file -isam: c +isam: b +register: reg:20M -- 1.7.10.4