X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=fd3cf494c1ef464fdd3d035f76df05e11c130c66;hb=ab8b17d44b9eef257e1380dc9b59c18006af60c7;hp=33cc784756837bfe4123fa578c34190b2dae4400;hpb=c51173afabc093ef88d833256a8958af6dcc95e6;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 33cc784..fd3cf49 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 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
@@ -34,8 +40,7 @@ CFG=${PREFIX}.cfg
 URLS=${PREFIX}_urls
 VALGRINDLOG=${PREFIX}_valgrind.log
 
-usevalgrind=false
-if $usevalgrind; then
+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
     YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 &
@@ -60,10 +65,6 @@ 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
@@ -76,20 +77,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 +108,17 @@ 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"
 
 # Kill programs
 
 if test -n "$PP2PID"; then
     kill $PP2PID
-    sleep 1
+    sleep 2
 fi
 
 exit $code