X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Frun_pazpar2.sh;h=ec9932df3a7440574fd5e1389d57b444783c7f95;hb=ca3347f5c96024d85b56c2fc9e3bb0d051aa064d;hp=f2e3de5073316716e8ea5174b8837ed17ee94838;hpb=bc60963049582dd7f1c7433ee32d882c1cca4d60;p=pazpar2-moved-to-github.git diff --git a/test/run_pazpar2.sh b/test/run_pazpar2.sh index f2e3de5..ec9932d 100755 --- a/test/run_pazpar2.sh +++ b/test/run_pazpar2.sh @@ -149,14 +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 "${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 @@ -183,7 +182,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