X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=1f4a94de4ab957de062aab40bdfcfc947c7e7567;hb=8cf288df88e558c157db98fb641e1961510417a3;hp=07bdf7244632a67e466243838db284d477ccea1d;hpb=03ff71001608b3b632b368bdd939b1abc8214c63;p=pazpar2-moved-to-github.git diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh index 07bdf72..1f4a94d 100755 --- a/test/run_pazpar2.sh +++ b/test/run_pazpar2.sh @@ -14,17 +14,19 @@ WAIT=120 kill_pazpar2() { - if test -n "$PP2PID"; then + if test -z "$SKIP_PAZPAR2" -a -n "$PP2PID"; then kill $PP2PID - fi - if test -n "$SLEEP_PID"; then - kill $SLEEP_PID - SLEEP_PID="" + PP2PID="" + rm -f pazpar2.pid 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 } ztest=false @@ -70,7 +72,7 @@ done IFS=$oIFS if test -z $curl; then - echo "Test $PREFIX: curl not found" + echo "$PREFIX: curl not found" exit 1 fi @@ -78,27 +80,45 @@ if test "$icu" = "true"; then if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then : else - echo "Skipping test ${PREFIX}: ICU support unavailable" + 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|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 + 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 test ${PREFIX}: recent yaz-ztest not found" + echo "Skipping ${PREFIX}: recent yaz-ztest not found" exit 0 fi rm -f ztest.pid @@ -127,17 +147,25 @@ else sec=1 maxrounds=10 fi -LEVELS=loglevel,fatal,warn,log,debug,notime,zoom,zoomdetails -if test -n "$PAZPAR2_USE_VALGRIND"; then +LEVELS=loglevel,fatal,warn,log,debug,zoom,zoomdetails +if test "$PERF_PROG"; then + eval $PERF_PROG ../src/pazpar2 -p pazpar2.pid -X -l ${PREFIX}_pazpar2.log -f ${srcdir}/${CFG} >${PREFIX}_extra_pazpar2.log 2>&1 & + PP2PID=$! + sleep 5 + if test -f pazpar2.pid; then + PP2PID=`cat pazpar2.pid` + echo "Got PID $PP2PID" + fi +elif 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 "Test ${PREFIX}: not starting Pazpar2 (should be running already)" + 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 @@ -147,7 +175,7 @@ if [ -z "$SKIP_PAZPAR2" -a -z "$WAIT_PAZPAR2" ] ; then trap kill_pazpar2 INT trap kill_pazpar2 HUP else - echo "Test ${PREFIX}: pazpar2 failed to start" + echo "${PREFIX}: pazpar2 failed to start" if test -f ztest.pid; then kill `cat ztest.pid` rm -f ztest.pid @@ -164,7 +192,8 @@ 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 @@ -185,22 +214,23 @@ 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" + if test $testno -eq 1 -o $rounds -eq 0; then + echo "${PREFIX} $testno: Making for the first time" mv $OUT2 $OUT1 code=1 + rounds=0 fi fi if test $rounds -gt 0; then @@ -210,8 +240,11 @@ for f in `cat ${srcdir}/${URLS}`; do testno=`expr $testno + 1` postfile= rounds=1 - elif echo $f | grep '^[0-9]' >/dev/null; then + elif echo $f | grep '^w' >/dev/null; then rounds=$maxrounds + elif echo $f | grep '^[0-9]' >/dev/null; then + sleep $f + rounds=1 else if test -f $srcdir/$f; then postfile=$srcdir/$f @@ -226,11 +259,13 @@ 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 + PP2PID="" + code=1 + break fi fi done @@ -244,15 +279,10 @@ 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 +kill_pazpar2 +sleep 2 +if test "$PERF_PROG"; then + tail -3 ${PREFIX}_extra_pazpar2.log fi exit $code