X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=b18e0a52ac2f63d964e4c719c1c6c4349c5a2ca9;hb=58bb9a208b2e9df48c6775d5999eb8db24b13813;hp=858bd45b0b92fd18bbb4d459ff6c62ba9129a1b7;hpb=3e2f2882c3d8af8de5aad628e73e450250f02fea;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 858bd45..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=:
@@ -28,51 +48,42 @@ fi
 GET='$curl --silent --output $OUT2 "$f"'
 POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2  "$f"'
 
-# Fire up pazpar2
-rm -f pazpar2.log
-
-PREFIX=$1
-if test "x${PREFIX}" = "x"; then
-    echo Missing prefix for run_pazpar2.sh
-    exit 1
+if [ -z "$SKIP_PAZPAR2" ] ; then
+# remove log if starting pazpar2
+    rm -f ${PREFIX}_pazpar2.log
 fi
+
 CFG=${PREFIX}.cfg
-URLS=${PREFIX}_urls
+URLS=${PREFIX}.urls
 VALGRINDLOG=${PREFIX}_valgrind.log
 
-usevalgrind=false
 if test -n "$PAZPAR2_USE_VALGRIND"; then
-    usevalgrind=$PAZPAR2_USE_VALGRIND;
-fi
-if $usevalgrind; 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
+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
+	echo "pazpar2 failed to start"
+	exit 1
+    fi
+fi
 
 # Set to success by default.. Will be set to non-zero in case of failure
 code=0
 
-if ps -p $PP2PID >/dev/null 2>&1; then
-    :
-else
-    code=1
-    PP2PID=""
-    echo "pazpar2 failed to start"
-fi
-
 # We can start test for real
-
-oIFS="$IFS"
-IFS='
-'
-
 testno=1
 for f in `cat ${srcdir}/${URLS}`; do
     if echo $f | grep '^http' >/dev/null; then
@@ -80,6 +91,9 @@ for f in `cat ${srcdir}/${URLS}`; do
 	OUT2=${PREFIX}_${testno}.log
 	DIFF=${PREFIX}_${testno}.dif
 	rm -f $OUT2 $DIFF
+	if [ -n "$DEBUG" ] ; then 
+	    echo "test $testno: $f" 
+	fi
 	if test -n "${postfile}"; then
 	    eval $POST
 	else
@@ -88,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"
@@ -104,29 +119,37 @@ for f in `cat ${srcdir}/${URLS}`; do
 	testno=`expr $testno + 1`
 	postfile=
     elif echo $f | grep '^[0-9]' >/dev/null; then
+	if [ -n "$DEBUG" ] ; then 
+	    echo "Sleeping $f"
+	fi
 	sleep $f
     else
-	if test -f $f; then
-	    postfile=$f
+	if test -f $srcdir/$f; then
+	    postfile=$srcdir/$f
 	else
 	    echo "File $f does not exist"
 	    code=1
 	fi
     fi
-    if ps -p $PP2PID >/dev/null 2>&1; then
-	:
-    else
-	IFS="$oIFS"
-	echo "Test $testno: pazpar2 died"
-	exit 1
+    if [ -z "$SKIP_PAZPAR2" ] ; then  
+	if ps -p $PP2PID >/dev/null 2>&1; then
+	    :
+	else
+	    IFS="$oIFS"
+	    if test -n "$SLEEP_PID"; then
+		echo "Test $testno: pazpar2 terminated (timeout, probably)"
+	    else
+		echo "Test $testno: pazpar2 died"
+	    fi
+	    exit 1
+	fi
     fi
 done
-IFS="$oIFS"
 
 # Kill programs
 
-if test -n "$PP2PID"; then
-    kill $PP2PID
+if [ -z "$SKIP_PAZPAR2" ] ; then 
+    kill_pazpar2
     sleep 2
 fi