Avoid useless temp

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

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 82cb708..fd3cf49 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"'
@@ -40,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 &
@@ -66,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
@@ -118,14 +113,12 @@ for f in `cat ${srcdir}/${URLS}`; do
        exit 1
     fi
 done
-IFS="$oIFS"
 
 # Kill programs
 
-sleep 1
 if test -n "$PP2PID"; then
     kill $PP2PID
-    sleep 1
+    sleep 2
 fi
 
 exit $code