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
Update for locale API changes.
[idzebra-moved-to-github.git]
/
test
/
gils
/
stop04.sh
diff --git
a/test/gils/stop04.sh
b/test/gils/stop04.sh
index
bce26c3
..
cf6f842
100755
(executable)
--- a/
test/gils/stop04.sh
+++ b/
test/gils/stop04.sh
@@
-1,47
+1,52
@@
#!/bin/sh
#!/bin/sh
-# $Id: stop04.sh,v 1.3 2003-05-06 20:09:28 adam Exp $
+# $Id: stop04.sh,v 1.11 2006-04-27 10:52:26 marc Exp $
# test start and stop of the forked server
# test start and stop of the forked server
-#
-echo "initializing"
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+ then
+ echo "Jumping over test"
+ exit 0
+fi
+
+LOG=stop04.log
+
+rm -f $LOG
+echo "initializing" >>$LOG
mkdir -p reg
mkdir -p reg
-rm -f idx.log srv.log
-../../index/zebraidx -l idx.log -c 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 idx.log -c zebra1.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $srcdir/zebra1.cfg update records || exit 1
-#kill old server (if any)
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
-rm -f zebrasrv.pid
-rm -f srv.log
+echo "Starting server with (forked)..." >>$LOG
+../../index/zebrasrv -D -p z.pid -c $srcdir/zebra1.cfg -l $LOG unix:socket
-echo "Starting server with (forked)..."
-../../index/zebrasrv -c zebra1.cfg -l srv.log tcp:@:9901 &
-sleep 1
-
-echo " checking that it runs... "
-test -f zebrasrv.pid || exit 1
-PID=`cat zebrasrv.pid`
-ps -p $PID | grep $PID >/dev/null || exit 1
+echo " checking that it runs... " >>$LOG
+test -f z.pid || exit 1
+PID=`cat z.pid`
+kill -CHLD $PID >/dev/null 2>&1 || exit 1
-echo " connecting to it..."
-../testclient localhost:9901 utah > log || exit 1
+echo " connecting to it..." >>$LOG
+../api/testclient unix:socket utah >>$LOG || exit 1
sleep 1
sleep 1
-echo " checking that it still runs..."
-ps -p $PID | grep $PID >/dev/null || exit 1
+echo " checking that it still runs..." >>$LOG
+kill -CHLD $PID >/dev/null 2>&1 || exit 1
-echo " connecting again, with a delay..."
-../testclient localhost:9901 utah 5 > log &
+echo " connecting again, with a delay..." >>$LOG
+../api/testclient unix:socket utah 5 >>$LOG
sleep 1 # let the client connect
sleep 1 # let the client connect
-echo " killing it..."
-kill $PID
+echo " killing it..." >>$LOG
+kill $PID
sleep 1
sleep 1
-echo " checking that the server is dead..."
-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 idx.log srv.log zebrasrv.pid
+rm -rf reg z.pid