X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=858bd45b0b92fd18bbb4d459ff6c62ba9129a1b7;hb=b2efe0bbbbe5aca31a268882795cd6f67c6c6012;hp=68f80e27de22d69227a03426d95df864a5e054bb;hpb=d61ba43c7996023b048d7d732a14dfa47179cd66;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 68f80e2..858bd45 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -1,28 +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:-"."}
 
-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
@@ -33,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
@@ -69,18 +80,14 @@ for f in `cat ${srcdir}/${URLS}`; do
 	OUT2=${PREFIX}_${testno}.log
 	DIFF=${PREFIX}_${testno}.dif
 	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
-		${wget} -q -O $OUT2 $f
-	    fi
-	elif test -n "${lynx}"; then
-	    ${lynx} -dump $f >$OUT2
+	if test -n "${postfile}"; then
+	    eval $POST
 	else
-	    break
+	    eval $GET
+	fi
+	if test ! -f $OUT2; then
+	    touch $OUT2
 	fi
-
 	if test -f $OUT1; then
 	    if diff $OUT1 $OUT2 >$DIFF; then
 		:
@@ -109,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