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
Extra wheezy release
[idzebra-moved-to-github.git]
/
test
/
gils
/
stop02.sh
diff --git
a/test/gils/stop02.sh
b/test/gils/stop02.sh
index
7f8a79a
..
e305294
100755
(executable)
--- a/
test/gils/stop02.sh
+++ b/
test/gils/stop02.sh
@@
-1,26
+1,28
@@
#!/bin/sh
#!/bin/sh
-# $Id: stop02.sh,v 1.8 2004-12-04 01:38:50 adam Exp $
# test start and stop of the server with -S
# test start and stop of the server with -S
-pp=${srcdir:-"."}
+srcdir=${srcdir:-"."}
+
+if [ "$srcdir" != "." ]
+ then
+ echo "Jumping over test"
+ exit 0
+fi
LOG=stop02.log
rm -f $LOG
echo "initializing" >>$LOG
test -d reg || mkdir reg
LOG=stop02.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
#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 -S (static)..." >>$LOG
echo "Starting server with -S (static)..." >>$LOG
-../../index/zebrasrv -D -p z.pid -S -c $pp/zebra1.cfg -l $LOG unix:socket
+../../index/zebrasrv -D -p z.pid -S -c $srcdir/zebra1.cfg -l $LOG unix:socket
echo " checking that it runs... " >>$LOG
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
PID=`cat z.pid`
kill -CHLD $PID >/dev/null 2>&1 || exit 1
@@
-38,8
+40,8
@@
sleep 1 # let the client connect
echo " killing it..." >>$LOG
kill $PID
echo " killing it..." >>$LOG
kill $PID
-sleep 1
echo " checking that it is dead..." >>$LOG
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
kill -CHLD $PID >/dev/null 2>&1 && exit 1
# clean up