X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Fgils%2Fstop01.sh;h=6c2b2a4e113cecd050f2ea97c414df10cd48170f;hb=c00bfddbf0f3608340d61298acc61dafb167f9b2;hp=c91e76afb9054dc3fb1371edce0be1797bf5819c;hpb=6e8c025fafc311744b5ef785238fe0a623aba6d9;p=idzebra-moved-to-github.git

diff --git a/test/gils/stop01.sh b/test/gils/stop01.sh
index c91e76a..6c2b2a4 100755
--- a/test/gils/stop01.sh
+++ b/test/gils/stop01.sh
@@ -1,36 +1,37 @@
 #!/bin/sh
-# $Id: stop01.sh,v 1.7 2004-09-24 15:03:19 adam Exp $
 # test start and stop of the server with -1
 
-pp=${srcdir:-"."}
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+    then
+    echo "Jumping over test"
+    exit 0
+fi
 
 LOG=stop01.log
 
 rm -f $LOG
 echo "initializing" >>$LOG
-mkdir -p reg
-../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
+test -d reg || mkdir reg
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg init || exit 1
 
 #create a base to test on
-../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update records  || exit 1
-
-#kill old server (if any)
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update records  || exit 1
 
 echo "Starting server with -1 (one shot)..." >>$LOG
-../../index/zebrasrv -1 -c $pp/zebra1.cfg -l $LOG tcp:@:9901 &
-sleep 1
+../../index/zebrasrv -D -p z.pid -1 -c $srcdir/zebra1.cfg -l $LOG unix:socket
 echo "  checking that it runs... " >>$LOG
-test -f zebrasrv.pid || sleep 5 || test -f zebrasrv.pid || exit 1
-PID=`cat zebrasrv.pid`
-ps -p $PID |grep $PID >/dev/null || exit 1
+test -f z.pid || exit 1
+PID=`cat z.pid`
+kill -CHLD $PID >/dev/null 2>&1 || exit 1
 
 echo "  connecting to it..." >>$LOG
-../api/testclient localhost:9901 utah >>$LOG || exit 1
-sleep 1
+../api/testclient unix:socket utah >>$LOG || exit 1
 
 echo "  checking that server does not run any more" >>$LOG
-ps -p $PID | grep $PID >/dev/null && exit 1
+kill -CHLD $PID >/dev/null 2>&1 && sleep 1 && \
+kill -CHLD $PID >/dev/null 2>&1 && exit 1
 
 # clean up
-rm -rf reg zebrasrv.pid
+rm -rf reg z.pid