X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=blobdiff_plain;f=test%2Fgils%2Ftiming2.sh;h=56e4b32774c4306f6e7e478c40e9907ad4bbe551;hp=fa90ca577b6e97ee3d736180beaa65fccfcfab72;hb=97a7adeb9e5059463f039495cc01cfa448463a27;hpb=cab06858d0404c4cd9dff44a38db53c81b8bd646

diff --git a/test/gils/timing2.sh b/test/gils/timing2.sh
index fa90ca5..56e4b32 100755
--- a/test/gils/timing2.sh
+++ b/test/gils/timing2.sh
@@ -1,72 +1,78 @@
-# timing2.sh 
+#!/bin/sh
 # 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
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
+
+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]
+# these should not be here, will be created later
+$srcdir/cleanrecords.sh
+
+../../index/zebraidx -c $srcdir/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 $srcdir/zebra2.cfg -l $LOG unix:socket
+test -f z.pid || exit 1
 sleep 1
-test -f zebrasrv.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 $srcdir/zebra2.cfg update $srcdir/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 unix:socket "@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 $srcdir/records/esdd0006.grs $srcdir/records/esdd0002.grs
+touch -r timeref1 $srcdir/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 $srcdir/zebra2.cfg update $srcdir/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 unix:socket "@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' <$srcdir/records/esdd0002.grs >$srcdir/records/esdd0002x.grs
+mv $srcdir/records/esdd0002x.grs $srcdir/records/esdd0002.grs
+touch -r timeref1 $srcdir/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 $srcdir/zebra2.cfg update $srcdir/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 unix:socket "@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 $srcdir/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 $srcdir/zebra2.cfg update $srcdir/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 unix:socket "@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]
+$srcdir/cleanrecords.sh
+rm -f z.pid
 
-echo ok