Testing: use standard IFS for test URLs

[pazpar2-moved-to-github.git] / test / run_pazpar2.sh

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index cdc6ee4..544dc98 100755 (executable)
--- 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"'
@@ -41,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
@@ -66,10 +69,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
@@ -118,7 +117,6 @@ for f in `cat ${srcdir}/${URLS}`; do
        exit 1
     fi
 done
-IFS="$oIFS"
 
 # Kill programs