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
Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/idzebra
[idzebra-moved-to-github.git]
/
test
/
gils
/
stop04.sh
diff --git
a/test/gils/stop04.sh
b/test/gils/stop04.sh
index
10bde11
..
d5faf89
100755
(executable)
--- a/
test/gils/stop04.sh
+++ b/
test/gils/stop04.sh
@@
-1,48
+1,51
@@
#!/bin/sh
#!/bin/sh
-# $Id: stop04.sh,v 1.6 2004-06-15 08:06:34 adam Exp $
# test start and stop of the forked server
# test start and stop of the forked server
-pp=${srcdir:-"."}
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+ then
+ echo "Jumping over test"
+ exit 0
+fi
LOG=stop04.log
rm -f $LOG
echo "initializing" >>$LOG
mkdir -p reg
LOG=stop04.log
rm -f $LOG
echo "initializing" >>$LOG
mkdir -p 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
#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 (forked)..." >>$LOG
echo "Starting server with (forked)..." >>$LOG
-../../index/zebrasrv -c $pp/zebra1.cfg -l $LOG tcp:@:9901 &
-sleep 1
+../../index/zebrasrv -D -p z.pid -c $srcdir/zebra1.cfg -l $LOG unix:socket
echo " checking that it runs... " >>$LOG
echo " checking that it runs... " >>$LOG
-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
echo " connecting to it..." >>$LOG
-../api/testclient localhost:9901 utah >>$LOG || exit 1
+../api/testclient unix:socket utah >>$LOG || exit 1
sleep 1
echo " checking that it still runs..." >>$LOG
sleep 1
echo " checking that it still runs..." >>$LOG
-ps -p $PID | grep $PID >/dev/null || exit 1
+kill -CHLD $PID >/dev/null 2>&1 || exit 1
echo " connecting again, with a delay..." >>$LOG
echo " connecting again, with a delay..." >>$LOG
-../api/testclient localhost:9901 utah 5 >>$LOG
+../api/testclient unix:socket utah 5 >>$LOG
sleep 1 # let the client connect
echo " killing it..." >>$LOG
kill $PID
sleep 1
sleep 1 # let the client connect
echo " killing it..." >>$LOG
kill $PID
sleep 1
-echo " checking that the server is dead..." >>$LOG
-ps -p $PID | grep $PID >/dev/null && exit 1
+echo " checking that it is dead..." >>$LOG
+kill -CHLD $PID >/dev/null 2>&1 && sleep 1 && \
+kill -CHLD $PID >/dev/null 2>&1 && exit 1
+
# clean up
# clean up
-rm -rf reg zebrasrv.pid
+rm -rf reg z.pid