From 03ff71001608b3b632b368bdd939b1abc8214c63 Mon Sep 17 00:00:00 2001
From: Adam Dickmeiss <adam@indexdata.dk>
Date: Wed, 13 Nov 2013 11:30:30 +0100
Subject: [PATCH] Testing fixes: handle without icu/ztest cases better

---
 test/run_pazpar2.sh |   39 ++++++++++++++++++++++-----------------
 1 file changed, 22 insertions(+), 17 deletions(-)

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index b24f59b..07bdf72 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -21,6 +21,10 @@ kill_pazpar2()
 	kill $SLEEP_PID
 	SLEEP_PID=""
     fi
+    if test -f ztest.pid; then
+	kill `cat ztest.pid`
+	rm -f ztest.pid
+    fi
 }
 
 ztest=false
@@ -66,10 +70,19 @@ done
 IFS=$oIFS
 
 if test -z $curl; then
-    echo "curl not found. $PREFIX can not be tested"
+    echo "Test $PREFIX: curl not found"
     exit 1
 fi
 
+if test "$icu" = "true"; then
+    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
+	:
+    else
+	echo "Skipping test ${PREFIX}: ICU support unavailable"
+	exit 0
+    fi
+fi
+
 if test "$ztest" = "true" ; then
     oIFS=$IFS
     IFS=:
@@ -85,7 +98,7 @@ if test "$ztest" = "true" ; then
     done
     IFS=$oIFS
     if test -z "$F"; then
-	echo "yaz-ztest not found"
+	echo "Skipping test ${PREFIX}: recent yaz-ztest not found"
 	exit 0
     fi
     rm -f ztest.pid
@@ -98,17 +111,6 @@ if test "$ztest" = "true" ; then
     fi
 fi
 
-GET='$curl --silent --output $OUT2 "$f"'
-POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2  "$f"'
-
-if test "$icu" = "true"; then
-    if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
-	:
-    else
-	SKIP_PAZPAR2=true
-    fi
-fi
-
 # remove log if starting pazpar2
 if [ -z "$SKIP_PAZPAR2" ] ; then
     rm -f ${PREFIX}_pazpar2.log
@@ -131,7 +133,7 @@ if test -n "$PAZPAR2_USE_VALGRIND"; then
     PP2PID=$!
     sleep 6
 elif test -n "$SKIP_PAZPAR2"; then
-    echo "Skipping pazpar2. Must already be running with correct config!!! "
+    echo "Test ${PREFIX}: not starting Pazpar2 (should be running already)"
 else
     ../src/pazpar2 -v $LEVELS -d -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
     PP2PID=$!
@@ -145,15 +147,18 @@ if [ -z "$SKIP_PAZPAR2" -a -z "$WAIT_PAZPAR2" ] ; then
 	trap kill_pazpar2 INT
 	trap kill_pazpar2 HUP
     else
-	echo "pazpar2 failed to start"
+	echo "Test ${PREFIX}: pazpar2 failed to start"
 	if test -f ztest.pid; then
 	    kill `cat ztest.pid`
-	    rm ztest.pid
+	    rm -f ztest.pid
 	fi
 	exit 1
     fi
 fi
 
+GET='$curl --silent --output $OUT2 "$f"'
+POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2  "$f"'
+
 # Set to success by default.. Will be set to non-zero in case of failure
 code=0
 
@@ -242,7 +247,7 @@ fi
 # Kill programs
 if test -f ztest.pid; then
     kill `cat ztest.pid`
-    rm ztest.pid
+    rm -f ztest.pid
 fi
 
 if [ -z "$SKIP_PAZPAR2" ] ; then
-- 
1.7.10.4