X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Ftiming2.sh;h=ddbd0fac2b6c2b652e72afb93c0383f402ffb95b;hb=339db25a87b77481458e80a2b932f7161fe597c6;hp=f9a78fe711bfb379178f80bdaf48d68e31ccc5c5;hpb=2147978ec217214e2fea9ca2d0a5b089fe0977f4;p=idzebra-moved-to-github.git

diff --git a/test/gils/timing2.sh b/test/gils/timing2.sh
index f9a78fe..ddbd0fa 100755
--- a/test/gils/timing2.sh
+++ b/test/gils/timing2.sh
@@ -1,51 +1,50 @@
 #!/bin/sh
-# $Id: timing2.sh,v 1.7 2003-05-24 22:34:48 adam Exp $ 
+# $Id: timing2.sh,v 1.10 2005-01-02 23:21:31 adam Exp $ 
 # Demonstrated that updates depend on file timestamps
 
+pp=${srcdir:-"."}
+
 LOG=timing2.log
 
 rm -f $LOG
 
 echo "  init..." >>$LOG
 rm -f log timeref[12]
-rm -f records/esdd000[12].grs # these should not be here, will be created later
-../../index/zebraidx -c zebra2.cfg -l $LOG init || exit 1
+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
 touch timeref1  # make an early timestamp
 
-echo "  killing old server (if any)..." >>$LOG
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-
 echo "  starting server..." >>$LOG
-../../index/zebrasrv -S -c zebra2.cfg -l $LOG tcp:@:9901 &
+../../index/zebrasrv -D -p z.pid -S -c $pp/zebra2.cfg -l $LOG tcp:@:9901
 sleep 1
-test -f zebrasrv.pid || exit 1
+test -f z.pid || exit 1
 touch timeref2  # make a later timestamp
 
 echo "  update 1..." >>$LOG
-../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "  search 1..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 9$" log >/dev/null || exit 1
 
 echo "making a test record..." >>$LOG
-cp records/esdd0006.grs records/esdd0002.grs
-touch -r timeref1 records/esdd0002.grs
+cp $pp/records/esdd0006.grs $pp/records/esdd0002.grs
+touch -r timeref1 $pp/records/esdd0002.grs
 
 echo "  indexing it..." >>$LOG
-../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "  search 2..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
 grep "^Result count: 10$" log >/dev/null || exit 1
 
 echo "  modifying a test record (xyz)..." >>$LOG
-sed 's/UTAH/XYZ/g' <records/esdd0002.grs >records/esdd0002x.grs
-mv records/esdd0002x.grs records/esdd0002.grs
-touch -r timeref1 records/esdd0002.grs # reset timestamp to 'early'
+sed 's/UTAH/XYZ/g' <$pp/records/esdd0002.grs >$pp/records/esdd0002x.grs
+mv $pp/records/esdd0002x.grs $pp/records/esdd0002.grs
+touch -r timeref1 $pp/records/esdd0002.grs # reset timestamp to 'early'
 
 echo "    not indexing it..." >>$LOG
-../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "    search 3..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
@@ -53,10 +52,10 @@ echo "    checking..." >>$LOG
 grep "^Result count: 10$" log >/dev/null || exit 1
 
 echo "  touching its timestamp..." >>$LOG
-touch -r timeref2 records/esdd0002.grs # set timestamp to 'late'
+touch -r timeref2 $pp/records/esdd0002.grs # set timestamp to 'late'
 
 echo "    indexing it..." >>$LOG
-../../index/zebraidx -l $LOG -c zebra2.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
 echo "    search 4..." >>$LOG
 ../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
@@ -64,9 +63,9 @@ echo "    checking..." >>$LOG
 grep "^Result count: 9$" log >/dev/null || exit 1
 
 echo "stopping server..." >>$LOG
-test -f zebrasrv.pid || exit 1
-kill `cat zebrasrv.pid` || exit 1
+test -f z.pid || exit 1
+kill `cat z.pid` || exit 1
 rm -f log timeref[12]
-rm -f records/esdd000[12].grs 
-rm -f zebrasrv.pid
+rm -f $pp/records/esdd000[12].grs 
+rm -f z.pid