X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fgils%2Ftest2.sh;h=2b57e2eaa0db80bd146c9fef059501f9fe5e7abb;hp=db2714bb53fe4d5dc8e43d056546d07fb61d1294;hb=c00bfddbf0f3608340d61298acc61dafb167f9b2;hpb=a692aad104901f14ecb713bf85940117c68108e7

diff --git a/test/gils/test2.sh b/test/gils/test2.sh
index db2714b..2b57e2e 100755
--- a/test/gils/test2.sh
+++ b/test/gils/test2.sh
@@ -1,26 +1,34 @@
 #!/bin/sh
-# $Id: test2.sh,v 1.13 2005-01-03 12:08:04 adam Exp $
 
-pp=${srcdir:-"."}
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
 
 LOG=test2.log
 
 rm -f $LOG
 echo "init..." >>$LOG
-rm -f $pp/records/esdd000[12].grs # these should not be here, will be created later
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg init || exit 1
+
+# these should not be here, will be created later
+$srcdir/cleanrecords.sh
+
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg init || exit 1
 
 echo "update 1..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
 echo "update 2..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
 echo "killing old server (if any)..." >>$LOG
 test -f z.pid && kill -9 `cat z.pid`
 
 echo "starting server..." >>$LOG
-../../index/zebrasrv -D -p z.pid -S -c $pp/zebra2.cfg -l $LOG unix:socket
+../../index/zebrasrv -D -p z.pid -S -c $srcdir/zebra2.cfg -l $LOG unix:socket
 test -f z.pid || exit 1
 
 echo "search 1..." >>$LOG
@@ -28,35 +36,35 @@ echo "search 1..." >>$LOG
 grep "^Result count: 9$" log >/dev/null || exit 1
 
 echo "update 3..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
 echo "search 2..." >>$LOG
 ../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 9$" log >/dev/null || exit 1
 
 echo "making test records..." >>$LOG
-cp $pp/records/esdd0006.grs $pp/records/esdd0001.grs
+cp $srcdir/records/esdd0006.grs $srcdir/records/esdd0001.grs
 
 echo "indexing them..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
 echo "search 3..." >>$LOG
 ../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 10$" log >/dev/null || exit 1
-touch $pp/records/esdd0001.grs
+touch $srcdir/records/esdd0001.grs
 
 echo "indexing again..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
 echo "search 4..." >>$LOG
 ../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 10$" log >/dev/null || exit 1
 
 echo "making another test record..." >>$LOG
-mv $pp/records/esdd0001.grs $pp/records/esdd0002.grs
+mv $srcdir/records/esdd0001.grs $srcdir/records/esdd0002.grs
 
 echo "indexing it too..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 
 echo "search 5..." >>$LOG
 ../api/testclient unix:socket "@attr 1=4 utah" > log || exit 1
@@ -64,11 +72,11 @@ grep "^Result count: 10$" log >/dev/null || exit 1
 
 sleep 1
 echo "modifying a test record..." >>$LOG
-sed 's/UTAH/XYZ/g' <$pp/records/esdd0002.grs >$pp/records/esdd0002x.grs
-mv $pp/records/esdd0002x.grs $pp/records/esdd0002.grs
+sed 's/UTAH/XYZ/g' <$srcdir/records/esdd0002.grs >$srcdir/records/esdd0002x.grs
+mv $srcdir/records/esdd0002x.grs $srcdir/records/esdd0002.grs
 
 echo "indexing it..." >>$LOG
-../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra2.cfg update $srcdir/records || exit 1
 sleep 1
 
 echo "search 6..." >>$LOG
@@ -79,9 +87,9 @@ echo "search 7..." >>$LOG
 ../api/testclient unix:socket "@attr 1=4 xyz" > log || exit 1
 grep "^Result count: 1$" log >/dev/null || exit 1
 
-echo "stopping server..." >>$LOG
+echo "stosrcdiring server..." >>$LOG
 test -f z.pid || exit 1
 kill `cat z.pid` || exit 1
 rm -f log
-rm -f $pp/records/esdd000[12].grs 
+$srcdir/cleanrecords.sh
 rm -f z.pid