X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=a0bc9a0eb11682607f963c9102e64b075d39cac7;hb=refs%2Fheads%2Fbranch-1.4.4;hp=712282ff00527bf5ded5cc16e53776b93e3112d3;hpb=b2866427cf621eb6bd23f01f7630503368c8b70d;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 712282f..a0bc9a0 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -1,40 +1,53 @@
 #!/bin/sh
 #
-# 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"'
 
+if [ -z "$SKIP_PAZPAR2" ] ; then
 # Fire up pazpar2
-rm -f pazpar2.log
-
-
+    rm -f pazpar2.log
+fi
 PREFIX=$1
 if test "x${PREFIX}" = "x"; then
     echo Missing prefix for run_pazpar2.sh
     exit 1
 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 &
+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} -t ${srcdir}/test_http.xml >extra_pazpar2.log 2>&1 &
+    YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -v all -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 &
 fi
 
 
@@ -46,35 +59,37 @@ sleep 3
 # 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"
+if [ -z "$SKIP_PAZPAR2" ] ; then 
+    if ps -p $PP2PID >/dev/null 2>&1; then
+	:
+    else
+	code=1
+	PP2PID=""
+	echo "pazpar2 failed to start"
+    fi
 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 [ -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
-	    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
@@ -84,26 +99,42 @@ for f in `cat ${srcdir}/${URLS}`; do
 	    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
+	if [ -n "$DEBUG" ] ; then 
+	    echo "Sleeping $f"
+	fi
 	sleep $f
-    fi
-    if ps -p $PP2PID >/dev/null 2>&1; then
-	:
     else
-	echo "pazpar2 died"
+	if test -f $srcdir/$f; then
+	    postfile=$srcdir/$f
+	else
+	    echo "File $f does not exist"
+	    code=1
+	fi
+    fi
+    if [ -z "$SKIP_PAZPAR2" ] ; then  
+	if ps -p $PP2PID >/dev/null 2>&1; then
+	    :
+	else
+	    IFS="$oIFS"
+	    echo "Test $testno: pazpar2 died"
+	    exit 1
+	fi
     fi
 done
-IFS="$oIFS"
 
-sleep 1
 # Kill programs
 
-if test -n "$PP2PID"; then
-    kill $PP2PID
+if [ -z "$SKIP_PAZPAR2" ] ; then 
+    if test -n "$PP2PID"; then
+	kill $PP2PID
+	sleep 2
+    fi
 fi
 
 exit $code