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
Refine test and make it more portable.
[idzebra-moved-to-github.git]
/
test
/
gils
/
stop01.sh
diff --git
a/test/gils/stop01.sh
b/test/gils/stop01.sh
index
92f7322
..
99b3ae4
100755
(executable)
--- a/
test/gils/stop01.sh
+++ b/
test/gils/stop01.sh
@@
-1,35
+1,35
@@
#!/bin/sh
#!/bin/sh
-# $Id: stop01.sh,v 1.5 2003-05-24 22:34:48 adam Exp $
+# $Id: stop01.sh,v 1.8 2004-12-04 01:38:50 adam Exp $
# test start and stop of the server with -1
# test start and stop of the server with -1
+pp=${srcdir:-"."}
+
LOG=stop01.log
rm -f $LOG
echo "initializing" >>$LOG
LOG=stop01.log
rm -f $LOG
echo "initializing" >>$LOG
-mkdir -p reg
-../../index/zebraidx -l $LOG -c zebra1.cfg init || exit 1
+test -d reg || mkdir reg
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
#create a base to test on
#create a base to test on
-../../index/zebraidx -l $LOG -c zebra1.cfg update records || exit 1
+../../index/zebraidx -l $LOG -c $pp/zebra1.cfg update records || exit 1
#kill old server (if any)
#kill old server (if any)
-test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
+test -f z.pid && kill -9 `cat z.pid`
echo "Starting server with -1 (one shot)..." >>$LOG
echo "Starting server with -1 (one shot)..." >>$LOG
-../../index/zebrasrv -1 -c zebra1.cfg -l $LOG tcp:@:9901 &
-sleep 1
-
+../../index/zebrasrv -D -p z.pid -1 -c $pp/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 || sleep 2 || 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 server does not run any more" >>$LOG
sleep 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 && exit 1
# clean up
# clean up
-rm -rf reg zebrasrv.pid
+rm -rf reg z.pid