Avoid useless temp

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

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 5a6b3bc..fd3cf49 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -1,29 +1,36 @@
 #!/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
-#            Outputs to test_http_<no>.log
-#            Matches against results in test_http_<no>.res
-#
-
+# Regression test using pazpar2 against z3950.indexdata.com/marc or gils
+# Reads Pazpar2 URLs from $1
+#            Outputs to $1_<no>.log
+#            Matches against results in $1_<no>.res
+# Requires curl
 
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-wget=""
-lynx=""
-if test -x /usr/bin/wget; then
-    wget=/usr/bin/wget
-fi
-if test -x /usr/bin/lynx; then
-    lynx=/usr/bin/lynx
+# look for curl in PATH
+oIFS=$IFS
+IFS=:
+curl=''
+for p in $PATH; do
+    if test -x $p/curl; then
+       curl=$p/curl
+       break
+    fi
+done
+IFS=$oIFS
+
+if test -z $curl; then
+    echo "curl not found. $PREFIX can not be tested"
+    exit 1
 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
@@ -31,11 +38,12 @@ 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 &
+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 &
 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
 
 
@@ -57,53 +65,60 @@ 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
        OUT1=${srcdir}/${PREFIX}_${testno}.res
        OUT2=${PREFIX}_${testno}.log
        DIFF=${PREFIX}_${testno}.dif
+       rm -f $OUT2 $DIFF
+       if test -n "${postfile}"; then
+           eval $POST
+       else
+           eval $GET
+       fi
+       if test ! -f $OUT2; then
+           touch $OUT2
+       fi
        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
-           else
-               break
-           fi
            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"
+       IFS="$oIFS"
+       echo "Test $testno: pazpar2 died"
+       exit 1
     fi
 done
-IFS="$oIFS"
 
-sleep 1
 # Kill programs
 
 if test -n "$PP2PID"; then
     kill $PP2PID
+    sleep 2
 fi
 
 exit $code