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

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index ac1521b..b18e0a5 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,13 +49,8 @@ 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
@@ -57,11 +58,11 @@ URLS=${PREFIX}.urls
 VALGRINDLOG=${PREFIX}_valgrind.log
 
 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 &
+    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 -v all -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=$!
@@ -101,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"