From: Adam Dickmeiss <adam@indexdata.dk>
Date: Sat, 4 Dec 2004 01:38:50 +0000 (+0000)
Subject: Refine test and make it more portable.
X-Git-Tag: snippet.version.1~237
X-Git-Url: http://git.indexdata.com/?p=idzebra-moved-to-github.git;a=commitdiff_plain;h=def5926f92384bf3acfcfa889e80cc167d7c5a3c

Refine test and make it more portable.
Use YAZ's daemon mode.
Use kill -CHLD to check if a process with PID exist (instead of ps -p).
Use unix:socket rather than tcp:port.
---

diff --git a/test/gils/stop01.sh b/test/gils/stop01.sh
index c91e76a..99b3ae4 100755
--- a/test/gils/stop01.sh
+++ b/test/gils/stop01.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: stop01.sh,v 1.7 2004-09-24 15:03:19 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
 
 pp=${srcdir:-"."}
@@ -8,29 +8,28 @@ LOG=stop01.log
 
 rm -f $LOG
 echo "initializing" >>$LOG
-mkdir -p reg
+test -d reg || mkdir reg
 ../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
 
 #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`
+test -f z.pid && kill -9 `cat z.pid`
 
 echo "Starting server with -1 (one shot)..." >>$LOG
-../../index/zebrasrv -1 -c $pp/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
-test -f zebrasrv.pid || sleep 5 || 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
-../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
-ps -p $PID | grep $PID >/dev/null && exit 1
+kill -CHLD $PID >/dev/null 2>&1 && exit 1
 
 # clean up
-rm -rf reg zebrasrv.pid
+rm -rf reg z.pid
diff --git a/test/gils/stop02.sh b/test/gils/stop02.sh
index 428bf2c..7f8a79a 100755
--- a/test/gils/stop02.sh
+++ b/test/gils/stop02.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# $Id: stop02.sh,v 1.7 2004-09-24 15:03:19 adam Exp $
+# $Id: stop02.sh,v 1.8 2004-12-04 01:38:50 adam Exp $
 # test start and stop of the server with -S
 
 pp=${srcdir:-"."}
@@ -8,33 +8,31 @@ LOG=stop02.log
 
 rm -f $LOG
 echo "initializing" >>$LOG
-mkdir -p reg
+test -d reg || mkdir reg
 ../../index/zebraidx -l $LOG -c $pp/zebra1.cfg init || exit 1
 
 #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`
+test -f z.pid && kill -9 `cat z.pid`
 
 echo "Starting server with -S (static)..." >>$LOG
-../../index/zebrasrv -S -c $pp/zebra1.cfg -l $LOG tcp:@:9901 &
-sleep 1
-
+../../index/zebrasrv -D -p z.pid -S -c $pp/zebra1.cfg -l $LOG unix:socket
 echo "  checking that it runs... " >>$LOG
-test -f zebrasrv.pid || sleep 5 || 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
-../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
-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
-../api/testclient -d 5 localhost:9901 utah >>$LOG &
+../api/testclient -d 5 unix:socket utah >>$LOG &
 sleep 1 # let the client connect 
 
 echo "  killing it..." >>$LOG
@@ -42,7 +40,7 @@ kill $PID
 
 sleep 1
 echo "  checking that it is dead..." >>$LOG
-ps -p $PID | grep $PID >/dev/null && exit 1
+kill -CHLD $PID >/dev/null 2>&1 && exit 1
 
 # clean up
-rm -rf reg zebrasrv.pid
+rm -rf reg z.pid