Moved file locking utilities from index/lockutil.c to util/flock.c

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

diff --git a/test/gils/timing1.sh b/test/gils/timing1.sh
index b59b876..286bed3 100755 (executable)
--- a/test/gils/timing1.sh
+++ b/test/gils/timing1.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: timing1.sh,v 1.9 2004-06-15 09:43:30 adam Exp $
+# $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
@@ -14,13 +14,9 @@ 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
 
-echo "  killing old server (if any)..." >>$LOG
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-
 echo "  starting server..." >>$LOG
-../../index/zebrasrv -S -c $pp/zebra2.cfg -l $LOG tcp:@:9901 &
-sleep 1
-test -f zebrasrv.pid || exit 1
+../../index/zebrasrv -D -p z.pid -S -c $pp/zebra2.cfg -l $LOG unix:socket
+test -f z.pid || exit 1
 sleep 2
 
 echo "  update 1..." >>$LOG
@@ -28,7 +24,7 @@ echo "  update 1..." >>$LOG
 sleep 2
 
 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
 sleep 2
 
@@ -40,7 +36,7 @@ echo "  indexing it..." >>$LOG
 sleep 2
 
 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
 
 sleep 2
@@ -53,7 +49,7 @@ echo "    indexing it..." >>$LOG
 
 sleep 2
 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: 9$" log >/dev/null || exit 1
 
@@ -67,7 +63,7 @@ echo "    indexing it..." >>$LOG
 
 sleep 2
 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: 10$" log >/dev/null || exit 1
 
@@ -81,7 +77,7 @@ echo "    indexing it..." >>$LOG
 
 sleep 2
 echo "    search 5..." >>$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
 
@@ -96,7 +92,7 @@ echo "    indexing it..." >>$LOG
 
 sleep 2
 echo "    search 6..." >>$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
 
@@ -112,7 +108,7 @@ echo "    indexing it..." >>$LOG
 
 sleep 2
 echo "    search 7..." >>$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
 
@@ -126,14 +122,14 @@ echo "    indexing it..." >>$LOG
 
 sleep 2
 echo "    search 8..." >>$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 "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
 rm -f $pp/records/esdd000[12].grs 
-rm -f zebrasrv.pid
+rm -f z.pid