X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftiming1.sh;h=7c83dd4825e4c90264c78c4809d5dc1011337def;hb=85ad68ab178a261dc548284ee68aae9107cbfaaf;hp=286bed35342d6b1235d542dcb67b491dc5efa004;hpb=a692aad104901f14ecb713bf85940117c68108e7;p=idzebra-moved-to-github.git

diff --git a/test/gils/timing1.sh b/test/gils/timing1.sh
index 286bed3..7c83dd4 100755
--- a/test/gils/timing1.sh
+++ b/test/gils/timing1.sh
@@ -1,26 +1,35 @@
 #!/bin/sh
-# $Id: timing1.sh,v 1.12 2005-01-03 12:08:04 adam Exp $
 # tests that updates are reflected immediately # in the registers.
 # Repeatedly modifies a record and counts hits.
 # Test 1: with good sleeps in every between - should pass always
 
-pp=${srcdir:-"."}
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
 
 LOG=timing1.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 -c $pp/zebra2.cfg -l $LOG init || exit 1
+
+# these should not be here, will be created later
+$srcdir/cleanrecords.sh
+
+
+../../index/zebraidx -c $srcdir/zebra2.cfg -l $LOG init || exit 1
 
 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
 sleep 2
 
 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
 sleep 2
 
 echo "  search 1..." >>$LOG
@@ -29,10 +38,10 @@ grep "^Result count: 9$" log >/dev/null || exit 1
 sleep 2
 
 echo "making a test record..." >>$LOG
-cp $pp/records/esdd0006.grs $pp/records/esdd0002.grs
+cp $srcdir/records/esdd0006.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 2
 
 echo "  search 2..." >>$LOG
@@ -41,11 +50,11 @@ grep "^Result count: 10$" log >/dev/null || exit 1
 
 sleep 2
 echo "  1a: modifying a test record (xyz)..." >>$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 2
 echo "    search 3..." >>$LOG
@@ -55,11 +64,11 @@ grep "^Result count: 9$" log >/dev/null || exit 1
 
 sleep 2
 echo "  1b: modifying the test record back (utah)..." >>$LOG
-sed 's/XYZ/UTAH/g' <$pp/records/esdd0002.grs >$pp/records/esdd0002x.grs
-mv $pp/records/esdd0002x.grs $pp/records/esdd0002.grs
+sed 's/XYZ/UTAH/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 2
 echo "    search 4..." >>$LOG
@@ -69,11 +78,11 @@ grep "^Result count: 10$" log >/dev/null || exit 1
 
 sleep 2
 echo "  2a: modifying the test record (xyz)..." >>$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 2
 echo "    search 5..." >>$LOG
@@ -83,12 +92,12 @@ grep "^Result count: 9$" log >/dev/null || exit 1
 
 sleep 2
 echo "  2b: modifying the test record back (utah)..." >>$LOG
-sed 's/XYZ/UTAH/g' <$pp/records/esdd0002.grs >$pp/records/esdd0002x.grs
-mv $pp/records/esdd0002x.grs $pp/records/esdd0002.grs
+sed 's/XYZ/UTAH/g' <$srcdir/records/esdd0002.grs >$srcdir/records/esdd0002x.grs
+mv $srcdir/records/esdd0002x.grs $srcdir/records/esdd0002.grs
 
 sleep 2
 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 2
 echo "    search 6..." >>$LOG
@@ -99,12 +108,12 @@ grep "^Result count: 10$" log >/dev/null || exit 1
 sleep 2
 
 echo "  3a: modifying the test record (xyz)..." >>$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
 
 sleep 2
 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 2
 echo "    search 7..." >>$LOG
@@ -114,11 +123,11 @@ grep "^Result count: 9$" log >/dev/null || exit 1
 
 sleep 2
 echo "  3b: modifying the test record back (utah)..." >>$LOG
-sed 's/XYZ/UTAH/g' <$pp/records/esdd0002.grs >$pp/records/esdd0002x.grs
-mv $pp/records/esdd0002x.grs $pp/records/esdd0002.grs
+sed 's/XYZ/UTAH/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 2
 echo "    search 8..." >>$LOG
@@ -130,6 +139,6 @@ echo "stopping 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