Update tests - embedded settings in service.

[pazpar2-moved-to-github.git] / test / run_pazpar2.sh

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 5a6b3bc..68f80e2 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -1,5 +1,4 @@
 #!/bin/sh
-# $Id: run_pazpar2.sh,v 1.1 2007-09-10 08:18:19 adam Exp $
 #
 # Regression test using pazpar2 against z3950.indexdata.com/marc
 # Reads Pazpar2 URLs from test_http_urls
@@ -31,11 +30,13 @@ if test "x${PREFIX}" = "x"; then
 fi
 CFG=${PREFIX}.cfg
 URLS=${PREFIX}_urls
+VALGRINDLOG=${PREFIX}_valgrind.log
 
-if test "$usevalgrind"; then
-    valgrind --log-file=valgrind ../src/pazpar2 -X -l pazpar2.log -f ${CFG} -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 &
+usevalgrind=false
+if $usevalgrind; then
+    valgrind --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
 else
-    ../src/pazpar2 -X -l pazpar2.log -f ${srcdir}/${CFG} -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 &
+    YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 &
 fi
 
 
@@ -67,34 +68,49 @@ for f in `cat ${srcdir}/${URLS}`; do
        OUT1=${srcdir}/${PREFIX}_${testno}.res
        OUT2=${PREFIX}_${testno}.log
        DIFF=${PREFIX}_${testno}.dif
-       if test -f $OUT1; then
-           rm -f $OUT2
-           if test -n "${wget}"; then
-               ${wget} -q -O $OUT2 $f
-           elif test -n "${lynx}"; then
-               ${lynx} -dump $f >$OUT2
+       rm -f $OUT2 $DIFF
+       if test -n "${wget}"; then
+           if test -n "${postfile}"; then
+               ${wget} -q -O $OUT2 --header="Content-Type: text/xml" --post-file=$postfile $f
            else
-               break
+               ${wget} -q -O $OUT2 $f
            fi
+       elif test -n "${lynx}"; then
+           ${lynx} -dump $f >$OUT2
+       else
+           break
+       fi
+
+       if test -f $OUT1; then
            if diff $OUT1 $OUT2 >$DIFF; then
                :
            else
                echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+               echo "URL: $f"
                code=1
            fi
        else
            echo "Test $testno: Making for the first time"
-           ${wget} -q -O $OUT1 $f
+           mv $OUT2 $OUT1
            code=1
        fi
        testno=`expr $testno + 1`
-    else
+       postfile=
+    elif echo $f | grep '^[0-9]' >/dev/null; then
        sleep $f
+    else
+       if test -f $f; then
+           postfile=$f
+       else
+           echo "File $f does not exist"
+           code=1
+       fi
     fi
     if ps -p $PP2PID >/dev/null 2>&1; then
        :
     else
-       echo "pazpar2 died"
+       echo "Test $testno: pazpar2 died"
+       exit 1
     fi
 done
 IFS="$oIFS"