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`
+ rm -f ztest.pid
fi
if test -n "$SLEEP_PID"; then
kill $SLEEP_PID
fi
}
+ztest=false
+icu=false
+while test $# -gt 0; do
+ case "$1" in
+ -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
+ *) optarg= ;;
+ esac
+ case $1 in
+ --ztest)
+ ztest=true
+ ;;
+ --icu)
+ icu=true
+ ;;
+ -*)
+ echo "Bad option $1"
+ exit 1
+ ;;
+ *)
+ PREFIX=$1
+ ;;
+ esac
+ shift
+done
+
+if test "x${PREFIX}" = "x"; then
+ echo Missing prefix for run_pazpar2.sh
+ exit 1
+fi
+
+URLS=${PREFIX}.urls
+if test ! -f ${srcdir}/${URLS}; then
+ echo "${srcdir}/${URLS} missing"
+ exit 1
+fi
+CFG=${PREFIX}.cfg
+if test ! -f ${srcdir}/${CFG}; then
+ echo "${srcdir}/${CFG} missing"
+ exit 1
+fi
+
# look for curl in PATH
oIFS=$IFS
IFS=:
IFS=$oIFS
if test -z $curl; then
- echo "curl not found. $PREFIX can not be tested"
+ echo "$PREFIX: curl not found"
exit 1
fi
-GET='$curl --silent --output $OUT2 "$f"'
-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
+if test "$icu" = "true"; then
+ if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
+ :
+ else
+ echo "Skipping ${PREFIX}: ICU support unavailable"
+ exit 0
+ fi
fi
-PREFIX=$1
-if test "x${PREFIX}" = "x"; then
- echo Missing prefix for run_pazpar2.sh
- exit 1
+
+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 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 ${PREFIX}: recent yaz-ztest not found"
+ exit 0
+ fi
+ rm -f ztest.pid
+ rm -f ${PREFIX}_ztest.log
+ $F -l ${PREFIX}_ztest.log -p ztest.pid -D tcp:localhost:9999
+ sleep 1
+ if test ! -f ztest.pid; then
+ echo "yaz-ztest could not be started"
+ exit 0
+ fi
+fi
+
+# remove log if starting pazpar2
+if [ -z "$SKIP_PAZPAR2" ] ; then
+ rm -f ${PREFIX}_pazpar2.log
fi
-CFG=${PREFIX}.cfg
-URLS=${PREFIX}.urls
VALGRINDLOG=${PREFIX}_valgrind.log
-if test -n "$PAZPAR2_USE_VALGRIND"; then
- valgrind --show-reachable=yes --leak-check=full --log-file=$VALGRINDLOG ../src/pazpar2 -X -l pazpar2.log -f ${CFG} >extra_pazpar2.log 2>&1 &
-elif test -n "$SKIP_PAZPAR2"; then
- echo "Skipping pazpar2. Must already be running with correct config!!! "
+if test `uname` = "Linux"; then
+ sec=0.3
+ maxrounds=20
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 &
+ sec=1
+ maxrounds=10
+fi
+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 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=$!
fi
-PP2PID=$!
-
-if [ -z "$SKIP_PAZPAR2" ] ; then
+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
- sleep 3
else
- echo "pazpar2 failed to start"
+ echo "${PREFIX}: pazpar2 failed to start"
+ if test -f ztest.pid; then
+ kill `cat ztest.pid`
+ rm -f ztest.pid
+ fi
exit 1
fi
fi
+GET='$curl --silent --output $OUT2 "$f"'
+POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2 "$f"'
+
# 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
+# 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
OUT2=${PREFIX}_${testno}.log
DIFF=${PREFIX}_${testno}.dif
rm -f $OUT2 $DIFF
- if [ -n "$DEBUG" ] ; then
- echo "test $testno: $f"
- fi
- 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 2>/dev/null; then
+ rm $DIFF
+ rm $OUT2
+ rounds=0
+ else
+ if test $rounds -eq 0; then
+ echo "${PREFIX} $testno: Failed. See $OUT1, $OUT2 and $DIFF"
+ echo "URL: $f"
+ code=1
+ fi
+ fi
+ else
+ 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
+ sleep $sec
+ fi
+ done
testno=`expr $testno + 1`
postfile=
+ rounds=1
+ elif echo $f | grep '^w' >/dev/null; then
+ rounds=$maxrounds
elif echo $f | grep '^[0-9]' >/dev/null; then
- if [ -n "$DEBUG" ] ; then
- echo "Sleeping $f"
- fi
sleep $f
+ rounds=1
else
if test -f $srcdir/$f; then
postfile=$srcdir/$f
code=1
fi
fi
- if [ -z "$SKIP_PAZPAR2" ] ; then
+ 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)"
+ 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
-# Kill programs
-
-if [ -z "$SKIP_PAZPAR2" ] ; then
- kill_pazpar2
- sleep 2
+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_pazpar2
+sleep 2
+if test "$PERF_PROG"; then
+ tail -3 ${PREFIX}_extra_pazpar2.log
fi
-
exit $code
# Local Variables: