X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=ec9932df3a7440574fd5e1389d57b444783c7f95;hb=b4e2292424ace7d7065ed2001e5e0a8f2d8f5daf;hp=091c8022aef1b9b16b32b99b91c4ac3afc02a26d;hpb=5a6963a361961b500fd22949bc083f50d28864c8;p=pazpar2-moved-to-github.git

diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh
index 091c802..ec9932d 100755
--- a/test/run_pazpar2.sh
+++ b/test/run_pazpar2.sh
@@ -17,13 +17,41 @@ kill_pazpar2()
     if test -n "$PP2PID"; then
 	kill $PP2PID
     fi
+    if test -f ztest.pid; then
+	kill `cat ztest.pid`
+	rm -f ztest.pid
+    fi
     if test -n "$SLEEP_PID"; then
 	kill $SLEEP_PID
 	SLEEP_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,67 @@ done
 IFS=$oIFS
 
 if test -z $curl; then
-    echo "curl not found. $PREFIX can not be tested"
+    echo "$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 ${PREFIX}: ICU support unavailable"
+	exit 0
+    fi
+fi
+
+if test "$ztest" = "true" ; then
+    YAZ_ZTEST_XML_FETCH=${srcdir}/${PREFIX}.
+    export YAZ_ZTEST_XML_FETCH
+
+    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 2>/dev/null|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+	    if test -n "$VERSION"; then
+		if test $VERSION -ge 4002052; then
+		    F=$p/yaz-ztest
+		    break
+		fi
+	    fi
+	fi
+    done
+    if test -z "$F"; then
+	for p in ${srcdir}/../../yaz ${srcdir}/../../yaz-*; do
+	    if test -x $p/ztest/yaz-ztest; then
+		VERSION=`$p/ztest/yaz-ztest -V 2>/dev/null|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+		if test -n "$VERSION"; then
+		    if test "$VERSION" -ge 4002052; then
+			F=$p/ztest/yaz-ztest
+			break
+		    fi
+		fi
+	    fi
+	done
+    fi
+    IFS=$oIFS
+    if test -z "$F"; then
+	echo "Skipping ${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
 
@@ -68,13 +149,13 @@ 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 -v $LEVELS -X -l ${PREFIX}_pazpar2.log -f ${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 &
     PP2PID=$!
-    sleep 6
+    sleep 0.01
+    WAIT=400
 elif test -n "$SKIP_PAZPAR2"; then
-    echo "Skipping pazpar2. Must already be running with correct config!!! "
+    echo "${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=$!
-    sleep 2
 fi
 
 if [ -z "$SKIP_PAZPAR2" -a -z "$WAIT_PAZPAR2" ] ; then
@@ -84,17 +165,25 @@ if [ -z "$SKIP_PAZPAR2" -a -z "$WAIT_PAZPAR2" ] ; then
 	trap kill_pazpar2 INT
 	trap kill_pazpar2 HUP
     else
-	echo "pazpar2 failed to start"
+	echo "${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
 
 # We can start test for real
 testno=1
-rounds=1
+# set rounds to "wait" because pazpar2 might not be ready
+rounds=$maxrounds
 for f in `cat ${srcdir}/${URLS}`; do
     if echo $f | grep '^http' >/dev/null; then
 	OUT1=${srcdir}/${PREFIX}_${testno}.res
@@ -115,20 +204,20 @@ for f in `cat ${srcdir}/${URLS}`; do
 	    fi
 	    rounds=`expr $rounds - 1`
 	    if test -f $OUT1 -a -z "$PAZPAR2_OVERRIDE_TEST"; then
-		if diff $OUT1 $OUT2 >$DIFF; then
+		if diff $OUT1 $OUT2 >$DIFF 2>/dev/null; then
 		    rm $DIFF
 		    rm $OUT2
 		    rounds=0
 		else
 		    if test $rounds -eq 0; then
-			echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+			echo "${PREFIX} $testno: Failed. See $OUT1, $OUT2 and $DIFF"
 			echo "URL: $f"
 			code=1
 		    fi
 		fi
 	    else
 		if test $rounds -eq 0; then
-		    echo "Test $testno: Making for the first time"
+		    echo "${PREFIX} $testno: Making for the first time"
 		    mv $OUT2 $OUT1
 		    code=1
 		fi
@@ -156,9 +245,9 @@ for f in `cat ${srcdir}/${URLS}`; do
 	else
 	    IFS="$oIFS"
 	    if test -n "$SLEEP_PID"; then
-		echo "Test $testno: pazpar2 terminated (timeout, probably)"
+		echo "${PREFIX} $testno: pazpar2 terminated (timeout, probably)"
 	    else
-		echo "Test $testno: pazpar2 died"
+		echo "${PREFIX} $testno: pazpar2 died"
 	    fi
 	    exit 1
 	fi
@@ -174,14 +263,16 @@ if [ "$WAIT_PAZPAR2" ] ; then
     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: