X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=b18e0a52ac2f63d964e4c719c1c6c4349c5a2ca9;hb=20bc8b17d60373c2c93ab6bb777d19dd92ed2960;hp=0dadcb188b6809805a85cc47ce55abbc55a2a713;hpb=9a29dfe185cbcbec55a5ca0a3c491b03ff45222f;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 0dadcb1..b18e0a5 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -9,6 +9,26 @@
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
+# terminate pazpar2 if test takes more than this (in seconds)
+WAIT=120
+
+kill_pazpar2()
+{
+    if test -n "$PP2PID"; then
+	kill $PP2PID
+    fi
+    if test -n "$SLEEP_PID"; then
+	kill $SLEEP_PID
+	SLEEP_PID=""
+    fi
+}
+
+PREFIX=$1
+if test "x${PREFIX}" = "x"; then
+    echo Missing prefix for run_pazpar2.sh
+    exit 1
+fi
+
 # look for curl in PATH
 oIFS=$IFS
 IFS=:
@@ -29,48 +49,41 @@ GET='$curl --silent --output $OUT2 "$f"'
 POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2  "$f"'
 
 if [ -z "$SKIP_PAZPAR2" ] ; then
-# Fire up pazpar2
-    rm -f pazpar2.log
-fi
-PREFIX=$1
-if test "x${PREFIX}" = "x"; then
-    echo Missing prefix for run_pazpar2.sh
-    exit 1
+# remove log if starting pazpar2
+    rm -f ${PREFIX}_pazpar2.log
 fi
 
 CFG=${PREFIX}.cfg
-URLS=${PREFIX}_urls
+URLS=${PREFIX}.urls
 VALGRINDLOG=${PREFIX}_valgrind.log
 
 if test -n "$PAZPAR2_USE_VALGRIND"; then
-    valgrind --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
+    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 &
 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 -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 &
+    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 &
 fi
 
-
 PP2PID=$!
 
-# Give it a chance to start properly..
-sleep 3
-
-# Set to success by default.. Will be set to non-zero in case of failure
-code=0
-
 if [ -z "$SKIP_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
-	code=1
-	PP2PID=""
 	echo "pazpar2 failed to start"
+	exit 1
     fi
 fi
 
-# We can start test for real
+# Set to success by default.. Will be set to non-zero in case of failure
+code=0
 
+# We can start test for real
 testno=1
 for f in `cat ${srcdir}/${URLS}`; do
     if echo $f | grep '^http' >/dev/null; then
@@ -89,9 +102,10 @@ for f in `cat ${srcdir}/${URLS}`; do
 	if test ! -f $OUT2; then
 	    touch $OUT2
 	fi
-	if test -f $OUT1; then
+	if test -f $OUT1 -a -z "$PAZPAR2_OVERRIDE_TEST"; then
 	    if diff $OUT1 $OUT2 >$DIFF; then
-		:
+		rm $DIFF
+		rm $OUT2
 	    else
 		echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
 		echo "URL: $f"
@@ -122,7 +136,11 @@ for f in `cat ${srcdir}/${URLS}`; do
 	    :
 	else
 	    IFS="$oIFS"
-	    echo "Test $testno: pazpar2 died"
+	    if test -n "$SLEEP_PID"; then
+		echo "Test $testno: pazpar2 terminated (timeout, probably)"
+	    else
+		echo "Test $testno: pazpar2 died"
+	    fi
 	    exit 1
 	fi
     fi
@@ -131,10 +149,8 @@ done
 # Kill programs
 
 if [ -z "$SKIP_PAZPAR2" ] ; then 
-    if test -n "$PP2PID"; then
-	kill $PP2PID
-	sleep 2
-    fi
+    kill_pazpar2
+    sleep 2
 fi
 
 exit $code