X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_facets.sh;h=c35bbec1f0c8f8974a029147146b5578a2750913;hb=a59ee0ce86aebff91e46adc1310f0a7699d88845;hp=89839e23701b7e10bf6efc47d28f41558d987e1b;hpb=4950aaf37c673f141162f2c1e663feb6a0267230;p=pazpar2-moved-to-github.git diff --git a/test/test_facets.sh b/test/test_facets.sh index 89839e2..c35bbec 100755 --- a/test/test_facets.sh +++ b/test/test_facets.sh @@ -1,5 +1,6 @@ #!/bin/sh +TEST=`basename $0 .sh` # srcdir might be set by make srcdir=${srcdir:-"."} @@ -8,9 +9,9 @@ oIFS=$IFS IFS=: F='' for p in $PATH; do - if test -x $p/yaz-ztest -a -x $p/yaz-config; then - VERSION=`$p/yaz-config -V|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'` - if test $VERSION -ge 4000012; then + 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 4002000; then F=$p/yaz-ztest break fi @@ -31,8 +32,13 @@ if test ! -f ztest.pid; then exit 0 fi -${srcdir}/run_pazpar2.sh test_facets -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