X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=c44ae9219ae21f31cb3bb9bd5efaf0e74b47ccb4;hb=03f3b108f3d34b804cc8f37a737fe2d018ba4af0;hp=e306b375bb6215076c9ea8af86578a06537711e5;hpb=637c167271c847a6eaec1cf21dbdf8b77b0b8075;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index e306b37..c44ae92 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -1,30 +1,36 @@
 #!/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:-"."}
 
-if test -x /usr/bin/curl; then
-    GET='/usr/bin/curl -s -o $OUT2 "$f"'
-    POST='/usr/bin/curl -s -H "Content-Type: text/xml" --data-binary "@$postfile" -o $OUT2  "$f"'
-elif test -x /usr/bin/wget; then
-    GET='/usr/bin/wget -q -O $OUT2 $f'
-    POST='/usr/bin/wget -q -O $OUT2 --header="Content-Type: text/xml" --post-file=$postfile $f'
-elif test -x /usr/bin/lynx; then
-    GET='/usr/bin/lynx -dump "$f" >$OUT2'
-    POST=''
+# 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 0
 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
@@ -35,6 +41,9 @@ URLS=${PREFIX}_urls
 VALGRINDLOG=${PREFIX}_valgrind.log
 
 usevalgrind=false
+if test -n "$PAZPAR2_USE_VALGRIND"; then
+    usevalgrind=$PAZPAR2_USE_VALGRIND;
+fi
 if $usevalgrind; then
     valgrind --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
 else
@@ -76,20 +85,16 @@ for f in `cat ${srcdir}/${URLS}`; do
 	else
 	    eval $GET
 	fi
+	if test ! -f $OUT2; then
+	    touch $OUT2
+	fi
 	if test -f $OUT1; then
-	    if test -f $OUT2; then
-		if diff $OUT1 $OUT2 >$DIFF; then
-		    :
-		else
-		    # wget returns 0-size file on HTTP error, curl dont.
-		    if test -s $OUT1; then
-			echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
-			echo "URL: $f"
-			code=1
-		    fi
-		fi
+	    if diff $OUT1 $OUT2 >$DIFF; then
+		:
 	    else
-		echo "Test $test: can not be performed"
+		echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+		echo "URL: $f"
+		code=1
 	    fi
 	else
 	    echo "Test $testno: Making for the first time"
@@ -111,17 +116,18 @@ for f in `cat ${srcdir}/${URLS}`; do
     if ps -p $PP2PID >/dev/null 2>&1; then
 	:
     else
+	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