X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=de6c021d049187752e6f8c5ffc99ee4376ef3b85;hb=7895ed928aac63bc69f3ee778d80335fb3c605ed;hp=cb6a9b3acf4fdb1104231f9abc5a0180174f3ab4;hpb=d0d4cdbdf868f6b17a2c6c0aa5f381d91284c178;p=pazpar2-moved-to-github.git diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh index cb6a9b3..de6c021 100755 --- a/test/run_pazpar2.sh +++ b/test/run_pazpar2.sh @@ -9,6 +9,9 @@ # srcdir might be set by make srcdir=${srcdir:-"."} +YAZ_ZTEST_XML_FETCH=${srcdir}/ +export YAZ_ZTEST_XML_FETCH + # terminate pazpar2 if test takes more than this (in seconds) WAIT=120 @@ -17,13 +20,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,86 +73,164 @@ 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 + 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 - rm -f $PREFIX_pazpar2.log +if [ -z "$SKIP_PAZPAR2" ] ; then + rm -f ${PREFIX}_pazpar2.log fi CFG=${PREFIX}.cfg URLS=${PREFIX}.urls VALGRINDLOG=${PREFIX}_valgrind.log +if test `uname` = "Linux"; then + sec=0.3 + maxrounds=20 +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 & -elif test -n "$SKIP_PAZPAR2"; then - echo "Skipping pazpar2. Must already be running with correct config!!! " + 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 + WAIT=400 +elif test -n "$SKIP_PAZPAR2"; then + echo "${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 "${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 for f in `cat ${srcdir}/${URLS}`; do if echo $f | grep '^http' >/dev/null; then OUT1=${srcdir}/${PREFIX}_${testno}.res OUT2=${PREFIX}_${testno}.log DIFF=${PREFIX}_${testno}.dif rm -f $OUT2 $DIFF - if [ -n "$DEBUG" ] ; then - echo "test $testno: $f" + if [ -n "$DEBUG" ] ; then + echo "test $testno: $f" fi - if test -n "${postfile}"; then - eval $POST - else - eval $GET - fi - if test ! -f $OUT2; then - touch $OUT2 - fi - if test -f $OUT1; then - if diff $OUT1 $OUT2 >$DIFF; then - : + while test $rounds -gt 0; do + if test -n "${postfile}"; then + eval $POST else - echo "Test $testno: Failed. See $OUT1, $OUT2 and $DIFF" - echo "URL: $f" - code=1 + eval $GET fi - else - echo "Test $testno: Making for the first time" - mv $OUT2 $OUT1 - code=1 - fi + if test ! -f $OUT2; then + touch $OUT2 + fi + rounds=`expr $rounds - 1` + if test -f $OUT1 -a -z "$PAZPAR2_OVERRIDE_TEST"; then + if diff $OUT1 $OUT2 >$DIFF 2>/dev/null; then + rm $DIFF + rm $OUT2 + rounds=0 + else + if test $rounds -eq 0; then + echo "${PREFIX} $testno: Failed. See $OUT1, $OUT2 and $DIFF" + echo "URL: $f" + code=1 + fi + fi + else + if test $rounds -eq 0; then + echo "${PREFIX} $testno: Making for the first time" + mv $OUT2 $OUT1 + code=1 + fi + fi + if test $rounds -gt 0; then + sleep $sec + fi + done testno=`expr $testno + 1` postfile= + rounds=1 elif echo $f | grep '^[0-9]' >/dev/null; then - if [ -n "$DEBUG" ] ; then - echo "Sleeping $f" - fi - sleep $f + rounds=$maxrounds else if test -f $srcdir/$f; then postfile=$srcdir/$f @@ -130,31 +239,40 @@ for f in `cat ${srcdir}/${URLS}`; do code=1 fi fi - if [ -z "$SKIP_PAZPAR2" ] ; then + if [ -z "$SKIP_PAZPAR2" ] ; then if ps -p $PP2PID >/dev/null 2>&1; then : 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 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 +if [ -z "$SKIP_PAZPAR2" ] ; then kill_pazpar2 sleep 2 fi - -# clean out empty diff files -find . -name "$TEST*.dif" -empty -delete - exit $code # Local Variables: