Use YAZ GFS PID file instead of zebrasrv.pid

[idzebra-moved-to-github.git] / test / gils / timing2.sh

diff --git a/test/gils/timing2.sh b/test/gils/timing2.sh
index 54a1974..ddbd0fa 100755 (executable)
--- a/test/gils/timing2.sh
+++ b/test/gils/timing2.sh
@@ -1,73 +1,71 @@
 #!/bin/sh
-# $Id: timing2.sh,v 1.4 2003-05-06 17:39:01 adam Exp $ 
+# $Id: timing2.sh,v 1.10 2005-01-02 23:21:31 adam Exp $ 
 # Demonstrated that updates depend on file timestamps
 
-echo "Testing timings of updates"
-echo "  init..."
-rm -f idx.log log timeref[12]
-rm -f records/esdd000[12].grs # these should not be here, will be created later
-../../index/zebraidx -c zebra2.cfg -l idx.log init || exit 1
-touch timeref1  # make an early timestamp
+pp=${srcdir:-"."}
+
+LOG=timing2.log
 
-echo "  killing old server (if any)..."
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-rm -f zebrasrv.pid
-rm -f srv.log
+rm -f $LOG
+
+echo "  init..." >>$LOG
+rm -f log timeref[12]
+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 "  starting server..."
-../../index/zebrasrv -S -c zebra2.cfg -l srv.log tcp:@:9901 &
+echo "  starting server..." >>$LOG
+../../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..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "  update 1..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
-echo "  search 1..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 9$" log || 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..."
-cp records/esdd0006.grs records/esdd0002.grs
-touch -r timeref1 records/esdd0002.grs
+echo "making a test record..." >>$LOG
+cp $pp/records/esdd0006.grs $pp/records/esdd0002.grs
+touch -r timeref1 $pp/records/esdd0002.grs
 
-echo "  indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "  indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
-echo "  search 2..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-grep "^Result count: 10$" log || 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)..."
-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'
+echo "  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
+touch -r timeref1 $pp/records/esdd0002.grs # reset timestamp to 'early'
 
-echo "    not indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "    not indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
-echo "    search 3..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-echo "    checking..."
-grep "^Result count: 10$" log || exit 1
+echo "    search 3..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..." >>$LOG
+grep "^Result count: 10$" log >/dev/null || exit 1
 
-echo "  touching its timestamp..."
-touch -r timeref2 records/esdd0002.grs # set timestamp to 'late'
+echo "  touching its timestamp..." >>$LOG
+touch -r timeref2 $pp/records/esdd0002.grs # set timestamp to 'late'
 
-echo "    indexing it..."
-../../index/zebraidx -l idx.log -c zebra2.cfg update records || exit 1
+echo "    indexing it..." >>$LOG
+../../index/zebraidx -l $LOG -c $pp/zebra2.cfg update $pp/records || exit 1
 
-echo "    search 4..."
-../testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
-echo "    checking..."
-grep "^Result count: 9$" log || exit 1
+echo "    search 4..." >>$LOG
+../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+echo "    checking..." >>$LOG
+grep "^Result count: 9$" log >/dev/null || exit 1
 
-echo "stopping server..."
-test -f zebrasrv.pid || exit 1
-kill -9 `cat zebrasrv.pid` || exit 1
-rm -f idx.log log timeref[12]
-rm -f records/esdd000[12].grs 
-rm -f zebrasrv.pid
-rm -f srv.log
+echo "stopping server..." >>$LOG
+test -f z.pid || exit 1
+kill `cat z.pid` || exit 1
+rm -f log timeref[12]
+rm -f $pp/records/esdd000[12].grs 
+rm -f z.pid
 
-echo ok