kill_pazpar2()
{
- if test -n "$PP2PID"; then
+ if test -z "$SKIP_PAZPAR2" -a -n "$PP2PID"; then
kill $PP2PID
+ PP2PID=""
+ rm -f pazpar2.pid
fi
if test -f ztest.pid; then
kill `cat ztest.pid`
maxrounds=10
fi
LEVELS=loglevel,fatal,warn,log,debug,zoom,zoomdetails
-if test -n "$PAZPAR2_USE_VALGRIND"; then
+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 0.01
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
else
echo "${PREFIX} $testno: pazpar2 died"
fi
- exit 1
+ PP2PID=""
+ code=1
+ break
fi
fi
done
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