kill $SLEEP_PID
SLEEP_PID=""
fi
+ if test -f ztest.pid; then
+ kill `cat ztest.pid`
+ rm -f ztest.pid
+ fi
}
-PREFIX=$1
+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
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
-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
+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=:
+ F=''
+ for p in $PATH; do
+ if test -x $p/yaz-ztest -a -x $p/yaz-client; then
+ VERSION=`$p/yaz-client -V|awk '{print $3;}'|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
+ if test $VERSION -ge 4002052; then
+ F=$p/yaz-ztest
+ break
+ fi
+ fi
+ done
+ IFS=$oIFS
+ if test -z "$F"; then
+ echo "Skipping test ${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
PP2PID=$!
sleep 6
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 -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
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
fi
-
exit $code
# Local Variables: