projects
/
idzebra-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reformat: delete trailing whitespace
[idzebra-moved-to-github.git]
/
test
/
gils
/
timing2.sh
diff --git
a/test/gils/timing2.sh
b/test/gils/timing2.sh
index
e34b1c2
..
56e4b32
100755
(executable)
--- a/
test/gils/timing2.sh
+++ b/
test/gils/timing2.sh
@@
-1,8
+1,13
@@
#!/bin/sh
#!/bin/sh
-# $Id: timing2.sh,v 1.9 2004-06-15 09:43:30 adam Exp $
# Demonstrated that updates depend on file timestamps
# Demonstrated that updates depend on file timestamps
-pp=${srcdir:-"."}
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+ then
+ echo "Jumping over test"
+ exit 0
+fi
LOG=timing2.log
LOG=timing2.log
@@
-10,65
+15,64
@@
rm -f $LOG
echo " init..." >>$LOG
rm -f log timeref[12]
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
+# these should not be here, will be created later
+$srcdir/cleanrecords.sh
-echo " killing old server (if any)..." >>$LOG
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
+../../index/zebraidx -c $srcdir/zebra2.cfg -l $LOG init || exit 1
+touch timeref1 # make an early timestamp
echo " starting server..." >>$LOG
echo " starting server..." >>$LOG
-../../index/zebrasrv -S -c $pp/zebra2.cfg -l $LOG tcp:@:9901 &
+../../index/zebrasrv -D -p z.pid -S -c $srcdir/zebra2.cfg -l $LOG unix:socket
+test -f z.pid || exit 1
sleep 1
sleep 1
-test -f zebrasrv.pid || exit 1
touch timeref2 # make a later timestamp
echo " update 1..." >>$LOG
touch timeref2 # make a later timestamp
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 " search 1..." >>$LOG
echo " search 1..." >>$LOG
-../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+../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..." >>$LOG
grep "^Result count: 9$" log >/dev/null || exit 1
echo "making a test record..." >>$LOG
-cp $pp/records/esdd0006.grs $pp/records/esdd0002.grs
-touch -r timeref1 $pp/records/esdd0002.grs
+cp $srcdir/records/esdd0006.grs $srcdir/records/esdd0002.grs
+touch -r timeref1 $srcdir/records/esdd0002.grs
echo " indexing it..." >>$LOG
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
echo " search 2..." >>$LOG
echo " search 2..." >>$LOG
-../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+../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)..." >>$LOG
grep "^Result count: 10$" log >/dev/null || exit 1
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'
+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..." >>$LOG
echo " not 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
echo " search 3..." >>$LOG
echo " search 3..." >>$LOG
-../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+../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..." >>$LOG
echo " checking..." >>$LOG
grep "^Result count: 10$" log >/dev/null || exit 1
echo " touching its timestamp..." >>$LOG
-touch -r timeref2 $pp/records/esdd0002.grs # set timestamp to 'late'
+touch -r timeref2 $srcdir/records/esdd0002.grs # set timestamp to 'late'
echo " indexing it..." >>$LOG
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
echo " search 4..." >>$LOG
echo " search 4..." >>$LOG
-../api/testclient localhost:9901 "@attr 1=4 utah" > log || exit 1
+../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..." >>$LOG
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 log timeref[12]
-rm -f $pp/records/esdd000[12].grs
-rm -f zebrasrv.pid
+$srcdir/cleanrecords.sh
+rm -f z.pid