Extend info command with hostname and YAZ SHA1

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

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index dd56ded..b18e0a5 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -50,7 +50,7 @@ POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile
 
 if [ -z "$SKIP_PAZPAR2" ] ; then
 # remove log if starting pazpar2
-    rm -f $PREFIX_pazpar2.log
+    rm -f ${PREFIX}_pazpar2.log
 fi
 
 CFG=${PREFIX}.cfg
@@ -102,9 +102,10 @@ for f in `cat ${srcdir}/${URLS}`; do
        if test ! -f $OUT2; then
            touch $OUT2
        fi
-       if test -f $OUT1; then
+       if test -f $OUT1 -a -z "$PAZPAR2_OVERRIDE_TEST"; then
            if diff $OUT1 $OUT2 >$DIFF; then
-               :
+               rm $DIFF
+               rm $OUT2
            else
                echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
                echo "URL: $f"