From: Adam Dickmeiss <adam@indexdata.dk>
Date: Mon, 27 May 2013 18:56:30 +0000 (+0200)
Subject: Facility for test script to post-wait
X-Git-Tag: v1.6.32~15
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=5a6963a361961b500fd22949bc083f50d28864c8;p=pazpar2-moved-to-github.git

Facility for test script to post-wait

If WAIT_PAZPAR2 is set, it defines number of minuters to wait
before shutting down pazpar2 daemon for test.
---

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 3746037..091c802 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -64,24 +64,25 @@ else
     sec=1
     maxrounds=10
 fi
-
+LEVELS=loglevel,fatal,warn,log,debug,notime,zoom,zoomdetails
 if test -n "$PAZPAR2_USE_VALGRIND"; then
-    valgrind --num-callers=30 --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l ${PREFIX}_pazpar2.log -f ${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    valgrind --num-callers=30 --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -v $LEVELS -X -l ${PREFIX}_pazpar2.log -f ${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    PP2PID=$!
+    sleep 6
 elif test -n "$SKIP_PAZPAR2"; then
     echo "Skipping pazpar2. Must already be running with correct config!!! "
 else
-    YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -v loglevel,fatal,warn,log,debug,notime,zoom,zoomdetails -d -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    ../src/pazpar2 -v $LEVELS -d -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    PP2PID=$!
+    sleep 2
 fi
 
-PP2PID=$!
-
-if [ -z "$SKIP_PAZPAR2" ] ; then
+if [ -z "$SKIP_PAZPAR2" -a -z "$WAIT_PAZPAR2" ] ; then
     if ps -p $PP2PID >/dev/null 2>&1; then
 	(sleep $WAIT; kill_pazpar2 >/dev/null) &
 	SLEEP_PID=$!
 	trap kill_pazpar2 INT
 	trap kill_pazpar2 HUP
-	sleep 3
     else
 	echo "pazpar2 failed to start"
 	exit 1
@@ -164,6 +165,16 @@ for f in `cat ${srcdir}/${URLS}`; do
     fi
 done
 
+if [ "$WAIT_PAZPAR2" ] ; then
+    i=0
+    while test $i -lt $WAIT_PAZPAR2; do
+	i=`expr $i + 1`
+	echo -n "$i."
+	sleep 60
+    done
+    echo "done"
+fi
+
 # Kill programs
 
 if [ -z "$SKIP_PAZPAR2" ] ; then