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

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index c44ae92..fd3cf49 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -23,7 +23,7 @@ IFS=$oIFS
 
 if test -z $curl; then
     echo "curl not found. $PREFIX can not be tested"
-    exit 0
+    exit 1
 fi
 GET='$curl --silent --output $OUT2 "$f"'
 POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2  "$f"'
@@ -40,11 +40,7 @@ CFG=${PREFIX}.cfg
 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
     YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -d -X -l pazpar2.log -f ${srcdir}/${CFG} >extra_pazpar2.log 2>&1 &
@@ -69,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
@@ -121,7 +113,6 @@ for f in `cat ${srcdir}/${URLS}`; do
 	exit 1
     fi
 done
-IFS="$oIFS"
 
 # Kill programs