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
Warn if zebra_{insert,update,delete,record} fails
[idzebra-moved-to-github.git]
/
test
/
gils
/
stop01.sh
diff --git
a/test/gils/stop01.sh
b/test/gils/stop01.sh
index
4c70b97
..
3bd6238
100755
(executable)
--- a/
test/gils/stop01.sh
+++ b/
test/gils/stop01.sh
@@
-1,35
+1,37
@@
-# test01.sh - test start and stop of the server with -1
-#
+#!/bin/sh
+# $Id: stop01.sh,v 1.6 2004-06-14 23:45:11 adam Exp $
+# test start and stop of the server with -1
-echo "initializing"
+pp=${srcdir:-"."}
+
+LOG=stop01.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 $pp/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 $pp/zebra1.cfg update records || exit 1
#kill old server (if any)
test -f zebrasrv.pid && kill -9 `cat zebrasrv.pid`
#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 -1 (one shot)..."
-../../index/zebrasrv -1 -c zebra1.cfg -l srv.log tcp:@:9901 &
+echo "Starting server with -1 (one shot)..." >>$LOG
+../../index/zebrasrv -1 -c $pp/zebra1.cfg -l $LOG tcp:@:9901 &
sleep 1
sleep 1
-echo " checking that it runs... "
+echo " checking that it runs... " >>$LOG
test -f zebrasrv.pid || exit 1
PID=`cat zebrasrv.pid`
test -f zebrasrv.pid || exit 1
PID=`cat zebrasrv.pid`
-ps -p $PID >/dev/null || exit 1
+ps -p $PID |grep $PID >/dev/null || exit 1
-echo " connecting to it..."
-../testclient localhost:9901 utah > log || exit 1
+echo " connecting to it..." >>$LOG
+../api/testclient localhost:9901 utah >>$LOG || exit 1
sleep 1
sleep 1
-echo " checking that server does not run any more"
-ps -p $PID >/dev/null && exit 1
+echo " checking that server does not run any more" >>$LOG
+ps -p $PID | grep $PID >/dev/null && exit 1
-echo ok
# clean up
# clean up
-rm -rf reg idx.log srv.log zebrasrv.pid
+rm -rf reg zebrasrv.pid