fi
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|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
+ 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"
fi
rm -f ztest.pid
rm -f ${PREFIX}_ztest.log
- $F -l ${PREFIX}_ztest.log -p ztest.pid -D tcp:localhost:9999
+ $F -l ${PREFIX}_ztest.log -a ztest_apdu.log -p ztest.pid -D tcp:localhost:9999
sleep 1
if test ! -f ztest.pid; then
echo "yaz-ztest could not be started"