X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=091c8022aef1b9b16b32b99b91c4ac3afc02a26d;hb=c0d763b3d02dcf269a4e45477668ac6bf901a204;hp=3a56249db00a0648568a658f34cb099374dd98c7;hpb=d1ca7704bc7178385b725e74cb82da1b9f1b2abe;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 3a56249..091c802 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -23,6 +23,12 @@ kill_pazpar2()
     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=:
@@ -43,36 +49,40 @@ 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 $PREFIX_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
 VALGRINDLOG=${PREFIX}_valgrind.log
 
+if test `uname` = "Linux"; then
+    sec=0.3
+    maxrounds=20
+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 pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
-elif test -n "$SKIP_PAZPAR2"; then 
-    echo "Skipping pazpar2. Must already be running with correct config!!! " 
+    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} >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
@@ -84,43 +94,54 @@ code=0
 
 # We can start test for real
 testno=1
+rounds=1
 for f in `cat ${srcdir}/${URLS}`; do
     if echo $f | grep '^http' >/dev/null; then
 	OUT1=${srcdir}/${PREFIX}_${testno}.res
 	OUT2=${PREFIX}_${testno}.log
 	DIFF=${PREFIX}_${testno}.dif
 	rm -f $OUT2 $DIFF
-	if [ -n "$DEBUG" ] ; then 
-	    echo "test $testno: $f" 
+	if [ -n "$DEBUG" ] ; then
+	    echo "test $testno: $f"
 	fi
-	if test -n "${postfile}"; then
-	    eval $POST
-	else
-	    eval $GET
-	fi
-	if test ! -f $OUT2; then
-	    touch $OUT2
-	fi
-	if test -f $OUT1; then
-	    if diff $OUT1 $OUT2 >$DIFF; then
-		:
+	while test $rounds -gt 0; do
+	    if test -n "${postfile}"; then
+		eval $POST
 	    else
-		echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
-		echo "URL: $f"
-		code=1
+		eval $GET
 	    fi
-	else
-	    echo "Test $testno: Making for the first time"
-	    mv $OUT2 $OUT1
-	    code=1
-	fi
+	    if test ! -f $OUT2; then
+		touch $OUT2
+	    fi
+	    rounds=`expr $rounds - 1`
+	    if test -f $OUT1 -a -z "$PAZPAR2_OVERRIDE_TEST"; then
+		if diff $OUT1 $OUT2 >$DIFF; then
+		    rm $DIFF
+		    rm $OUT2
+		    rounds=0
+		else
+		    if test $rounds -eq 0; then
+			echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+			echo "URL: $f"
+			code=1
+		    fi
+		fi
+	    else
+		if test $rounds -eq 0; then
+		    echo "Test $testno: Making for the first time"
+		    mv $OUT2 $OUT1
+		    code=1
+		fi
+	    fi
+	    if test $rounds -gt 0; then
+		sleep $sec
+	    fi
+	done
 	testno=`expr $testno + 1`
 	postfile=
+	rounds=1
     elif echo $f | grep '^[0-9]' >/dev/null; then
-	if [ -n "$DEBUG" ] ; then 
-	    echo "Sleeping $f"
-	fi
-	sleep $f
+	rounds=$maxrounds
     else
 	if test -f $srcdir/$f; then
 	    postfile=$srcdir/$f
@@ -129,7 +150,7 @@ for f in `cat ${srcdir}/${URLS}`; do
 	    code=1
 	fi
     fi
-    if [ -z "$SKIP_PAZPAR2" ] ; then  
+    if [ -z "$SKIP_PAZPAR2" ] ; then
 	if ps -p $PP2PID >/dev/null 2>&1; then
 	    :
 	else
@@ -144,16 +165,23 @@ 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 
+if [ -z "$SKIP_PAZPAR2" ] ; then
     kill_pazpar2
     sleep 2
 fi
 
-# clean out empty diff files
-find . -name "$TEST*.dif" -empty -delete 
-
 exit $code
 
 # Local Variables: