Testing fixes: handle without icu/ztest cases better

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

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 3746037..07bdf72 100755 (executable)
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -21,9 +21,37 @@ kill_pazpar2()
        kill $SLEEP_PID
        SLEEP_PID=""
     fi
+    if test -f ztest.pid; then
+       kill `cat ztest.pid`
+       rm -f ztest.pid
+    fi
 }
 
-PREFIX=$1
+ztest=false
+icu=false
+while test $# -gt 0; do
+    case "$1" in
+        -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+        *) optarg= ;;
+    esac
+    case $1 in
+        --ztest)
+            ztest=true
+            ;;
+        --icu)
+            icu=true
+            ;;
+        -*)
+           echo "Bad option $1"
+           exit 1
+            ;;
+       *)
+           PREFIX=$1
+           ;;
+    esac
+    shift
+done
+
 if test "x${PREFIX}" = "x"; then
     echo Missing prefix for run_pazpar2.sh
     exit 1
@@ -42,14 +70,49 @@ 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
-GET='$curl --silent --output $OUT2 "$f"'
-POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2  "$f"'
 
-if [ -z "$SKIP_PAZPAR2" ] ; then
+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=:
+    F=''
+    for p in $PATH; do
+       if test -x $p/yaz-ztest -a -x $p/yaz-client; then
+           VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+            if test $VERSION -ge 4002052; then
+               F=$p/yaz-ztest
+               break
+            fi
+       fi
+    done
+    IFS=$oIFS
+    if test -z "$F"; then
+       echo "Skipping test ${PREFIX}: recent yaz-ztest not found"
+       exit 0
+    fi
+    rm -f ztest.pid
+    rm -f ${PREFIX}_ztest.log
+    $F -l ${PREFIX}_ztest.log -p ztest.pid -D tcp:localhost:9999
+    sleep 1
+    if test ! -f ztest.pid; then
+       echo "yaz-ztest could not be started"
+       exit 0
+    fi
+fi
+
 # remove log if starting pazpar2
+if [ -z "$SKIP_PAZPAR2" ] ; then
     rm -f ${PREFIX}_pazpar2.log
 fi
 
@@ -64,30 +127,38 @@ else
     sec=1
     maxrounds=10
 fi
-
+LEVELS=loglevel,fatal,warn,log,debug,notime,zoom,zoomdetails
 if test -n "$PAZPAR2_USE_VALGRIND"; then
-    valgrind --num-callers=30 --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l ${PREFIX}_pazpar2.log -f ${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    valgrind --num-callers=30 --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -v $LEVELS -X -l ${PREFIX}_pazpar2.log -f ${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    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
-    YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -v loglevel,fatal,warn,log,debug,notime,zoom,zoomdetails -d -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    ../src/pazpar2 -v $LEVELS -d -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
+    PP2PID=$!
+    sleep 2
 fi
 
-PP2PID=$!
-
-if [ -z "$SKIP_PAZPAR2" ] ; then
+if [ -z "$SKIP_PAZPAR2" -a -z "$WAIT_PAZPAR2" ] ; then
     if ps -p $PP2PID >/dev/null 2>&1; then
        (sleep $WAIT; kill_pazpar2 >/dev/null) &
        SLEEP_PID=$!
        trap kill_pazpar2 INT
        trap kill_pazpar2 HUP
-       sleep 3
     else
-       echo "pazpar2 failed to start"
+       echo "Test ${PREFIX}: pazpar2 failed to start"
+       if test -f ztest.pid; then
+           kill `cat 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
 
@@ -164,13 +235,25 @@ for f in `cat ${srcdir}/${URLS}`; do
     fi
 done
 
+if [ "$WAIT_PAZPAR2" ] ; then
+    i=0
+    while test $i -lt $WAIT_PAZPAR2; do
+       i=`expr $i + 1`
+       echo -n "$i."
+       sleep 60
+    done
+    echo "done"
+fi
 # Kill programs
+if test -f ztest.pid; then
+    kill `cat ztest.pid`
+    rm -f ztest.pid
+fi
 
 if [ -z "$SKIP_PAZPAR2" ] ; then
     kill_pazpar2
     sleep 2
 fi
-
 exit $code
 
 # Local Variables: