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

diff --git a/test/gils/stop01.sh b/test/gils/stop01.sh
index 99b3ae4..6c2b2a4 100755
--- a/test/gils/stop01.sh
+++ b/test/gils/stop01.sh
@@ -1,34 +1,36 @@
 #!/bin/sh
-# $Id: stop01.sh,v 1.8 2004-12-04 01:38:50 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
 test -d reg || mkdir reg
-../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
+../../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 z.pid && kill -9 `cat z.pid`
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update records  || exit 1
 
 echo "Starting server with -1 (one shot)..." >>$LOG
-../../index/zebrasrv -D -p z.pid -1 -c $pp/zebra1.cfg -l $LOG unix:socket
+../../index/zebrasrv -D -p z.pid -1 -c $srcdir/zebra1.cfg -l $LOG unix:socket
 echo "  checking that it runs... " >>$LOG
-test -f z.pid || sleep 2 || test -f z.pid || 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 unix:socket utah >>$LOG || exit 1
-sleep 1
 
 echo "  checking that server does not run any more" >>$LOG
+kill -CHLD $PID >/dev/null 2>&1 && sleep 1 && \
 kill -CHLD $PID >/dev/null 2>&1 && exit 1
 
 # clean up