if test -n "$PP2PID"; then
kill $PP2PID
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
SLEEP_PID=""
IFS=$oIFS
if test -z $curl; then
- echo "curl not found. $PREFIX can not be tested"
+ echo "Test $PREFIX: curl not found"
exit 1
fi
+if test "$icu" = "true"; then
+ if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
+ :
+ else
+ echo "Skipping test ${PREFIX}: ICU support unavailable"
+ exit 0
+ fi
+fi
+
if test "$ztest" = "true" ; then
oIFS=$IFS
IFS=:
done
IFS=$oIFS
if test -z "$F"; then
- echo "yaz-ztest not found"
+ echo "Skipping test ${PREFIX}: recent yaz-ztest not found"
exit 0
fi
rm -f ztest.pid
fi
fi
-GET='$curl --silent --output $OUT2 "$f"'
-POST='$curl --silent --header "Content-Type: text/xml" --data-binary "@$postfile" --output $OUT2 "$f"'
-
-if test "$icu" = "true"; then
- if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then
- :
- else
- SKIP_PAZPAR2=true
- fi
-fi
-
# remove log if starting pazpar2
if [ -z "$SKIP_PAZPAR2" ] ; then
rm -f ${PREFIX}_pazpar2.log
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
+ WAIT=400
elif test -n "$SKIP_PAZPAR2"; then
- echo "Skipping pazpar2. Must already be running with correct config!!! "
+ echo "Test ${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=$!
trap kill_pazpar2 INT
trap kill_pazpar2 HUP
else
- echo "pazpar2 failed to start"
+ echo "Test ${PREFIX}: pazpar2 failed to start"
if test -f ztest.pid; then
kill `cat ztest.pid`
- rm 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
fi
rounds=`expr $rounds - 1`
if test -f $OUT1 -a -z "$PAZPAR2_OVERRIDE_TEST"; then
- if diff $OUT1 $OUT2 >$DIFF; then
+ if diff $OUT1 $OUT2 >$DIFF 2>/dev/null; then
rm $DIFF
rm $OUT2
rounds=0
# Kill programs
if test -f ztest.pid; then
kill `cat ztest.pid`
- rm ztest.pid
+ rm -f ztest.pid
fi
if [ -z "$SKIP_PAZPAR2" ] ; then