# 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=:
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
-fi
-PREFIX=$1
-if test "x${PREFIX}" = "x"; then
- echo Missing prefix for run_pazpar2.sh
- exit 1
+# remove log if starting pazpar2
+ rm -f $PREFIX_pazpar2.log
fi
CFG=${PREFIX}.cfg
-URLS=${PREFIX}_urls
+URLS=${PREFIX}.urls
VALGRINDLOG=${PREFIX}_valgrind.log
if test -n "$PAZPAR2_USE_VALGRIND"; then
- valgrind --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
+ 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!!! "
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 &
+ 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 &
fi
-
PP2PID=$!
-# Give it a chance to start properly..
-sleep 3
-
-# Set to success by default.. Will be set to non-zero in case of failure
-code=0
-
if [ -z "$SKIP_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
- code=1
- PP2PID=""
echo "pazpar2 failed to start"
+ exit 1
fi
fi
-# We can start test for real
+# 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
for f in `cat ${srcdir}/${URLS}`; do
if echo $f | grep '^http' >/dev/null; then
:
else
IFS="$oIFS"
- echo "Test $testno: pazpar2 died"
+ if test -n "$SLEEP_PID"; then
+ echo "Test $testno: pazpar2 terminated (timeout, probably)"
+ else
+ echo "Test $testno: pazpar2 died"
+ fi
exit 1
fi
fi
# Kill programs
if [ -z "$SKIP_PAZPAR2" ] ; then
- if test -n "$PP2PID"; then
- kill $PP2PID
- sleep 2
- fi
+ kill_pazpar2
+ sleep 2
fi
exit $code