X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=test%2Ftest_termlist_block.sh;h=dbe89d9716953be012b1ef956733e88ae2075811;hb=95ee4e86170d02d0df7d11203edf56aea59d7187;hp=fb9e31b7b8daeba2a792e4385fb0a54e5651e8f0;hpb=29d31cc7a80dc6c40486b2af56ed85f3258348ef;p=pazpar2-moved-to-github.git diff --git a/test/test_termlist_block.sh b/test/test_termlist_block.sh index fb9e31b..dbe89d9 100755 --- a/test/test_termlist_block.sh +++ b/test/test_termlist_block.sh @@ -4,7 +4,7 @@ # srcdir might be set by make srcdir=${srcdir:-"."} -TEST=test_termlist_block +TEST=`basename $0 .sh` # look for yaz-ztest in PATH oIFS=$IFS @@ -13,7 +13,7 @@ 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 4000000; then + if test $VERSION -ge 4002052; then F=$p/yaz-ztest break fi @@ -35,9 +35,14 @@ if test ! -f ztest.pid; then exit 0 fi -# Test using test_http.cfg -${srcdir}/run_pazpar2.sh ${TEST} -E=$? +E=0 +if test -x ../src/pazpar2; then + if ../src/pazpar2 -V |grep icu:enabled >/dev/null; then + ${srcdir}/run_pazpar2.sh $TEST + E=$? + fi +fi + kill `cat ztest.pid` rm ztest.pid exit $E