# srcdir might be set by make
srcdir=${srcdir:-"."}
+# terminate pazpar2 if test takes more than this (in seconds)
+WAIT=120
+
+kill_pazpar2()
+{
+ if test -n "$PP2PID"; then
+ kill $PP2PID
+ fi
+ if test -n "$SLEEP_PID"; then
+ kill $SLEEP_PID
+ SLEEP_PID=""
+ fi
+}
+
+PREFIX=$1
+if test "x${PREFIX}" = "x"; then
+ echo Missing prefix for run_pazpar2.sh
+ exit 1
+fi
+
# look for curl in PATH
oIFS=$IFS
IFS=:
GET='$curl --silent --output $OUT2 "$f"'
POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2 "$f"'
-# Fire up pazpar2
-rm -f pazpar2.log
-
-PREFIX=$1
-if test "x${PREFIX}" = "x"; then
- echo Missing prefix for run_pazpar2.sh
- exit 1
+if [ -z "$SKIP_PAZPAR2" ] ; then
+# remove log if starting pazpar2
+ rm -f ${PREFIX}_pazpar2.log
fi
+
CFG=${PREFIX}.cfg
-URLS=${PREFIX}_urls
+URLS=${PREFIX}.urls
VALGRINDLOG=${PREFIX}_valgrind.log
-usevalgrind=false
-if test -n "$PAZPAR2_USE_VALGRIND"; then
- usevalgrind=$PAZPAR2_USE_VALGRIND;
+if test `uname` = "Linux"; then
+ sec=0.3
+ maxrounds=20
+else
+ sec=1
+ maxrounds=10
fi
-if $usevalgrind; then
- valgrind --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
+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
+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 -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=$!
-
-# Give it a chance to start properly..
-sleep 3
+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
+ else
+ echo "pazpar2 failed to start"
+ exit 1
+ fi
+fi
# Set to success by default.. Will be set to non-zero in case of failure
code=0
-if ps -p $PP2PID >/dev/null 2>&1; then
- :
-else
- code=1
- PP2PID=""
- echo "pazpar2 failed to start"
-fi
-
# We can start test for real
-
-oIFS="$IFS"
-IFS='
-'
-
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 test -n "${postfile}"; then
- eval $POST
- else
- eval $GET
- fi
- if test ! -f $OUT2; then
- touch $OUT2
+ if [ -n "$DEBUG" ] ; then
+ echo "test $testno: $f"
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
- sleep $f
+ rounds=$maxrounds
else
- if test -f $f; then
- postfile=$f
+ if test -f $srcdir/$f; then
+ postfile=$srcdir/$f
else
echo "File $f does not exist"
code=1
fi
fi
- if ps -p $PP2PID >/dev/null 2>&1; then
- :
- else
- IFS="$oIFS"
- echo "Test $testno: pazpar2 died"
- exit 1
+ 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)"
+ else
+ echo "Test $testno: pazpar2 died"
+ fi
+ exit 1
+ fi
fi
done
-IFS="$oIFS"
+
+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 -n "$PP2PID"; then
- kill $PP2PID
+if [ -z "$SKIP_PAZPAR2" ] ; then
+ kill_pazpar2
sleep 2
fi
projects / pazpar2-moved-to-github.git / blobdiff