X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=b24f59b850b2dc5480cff698486bf59584997f8c;hb=ad64ba8638377cc453aa496f046b85e5892037ed;hp=f5f9f8e7b5908bef3722cce8015178ea035d7eb2;hpb=5d490c17fb52d9c49c5c0c7d980f617fbed3db8b;p=pazpar2-moved-to-github.git diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh index f5f9f8e..b24f59b 100755 --- a/test/run_pazpar2.sh +++ b/test/run_pazpar2.sh @@ -23,6 +23,36 @@ kill_pazpar2() fi } +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 +fi + # look for curl in PATH oIFS=$IFS IFS=: @@ -39,42 +69,87 @@ if test -z $curl; then echo "curl not found. $PREFIX can not be tested" exit 1 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 "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 + 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 -# Fire up pazpar2 - rm -f pazpar2.log +if test "$icu" = "true"; then + if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then + : + else + SKIP_PAZPAR2=true + fi fi -PREFIX=$1 -if test "x${PREFIX}" = "x"; then - echo Missing prefix for run_pazpar2.sh - exit 1 + +# remove log if starting pazpar2 +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 --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >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 +elif test -n "$SKIP_PAZPAR2"; then + echo "Skipping pazpar2. Must already be running with correct config!!! " else - YAZ_LOG=zoom,zoomdetails,debug,log,fatal ../src/pazpar2 -v all -d -X -l pazpar2.log -f ${srcdir}/${CFG} >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" + if test -f ztest.pid; then + kill `cat ztest.pid` + rm ztest.pid + fi exit 1 fi fi @@ -84,43 +159,54 @@ 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; then + rm $DIFF + rm $OUT2 + rounds=0 + else + if test $rounds -eq 0; then + echo "Test $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" + 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 @@ -129,7 +215,7 @@ 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 @@ -144,13 +230,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 ztest.pid +fi -if [ -z "$SKIP_PAZPAR2" ] ; then +if [ -z "$SKIP_PAZPAR2" ] ; then kill_pazpar2 sleep 2 fi - exit $code # Local Variables: