X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_facets.sh;h=e64b961e3a35dbab39fa2165795ca1d51cdec901;hb=80655e4b90bbe16ee3e3373ef310267cd5a651a3;hp=4b3c2767445c027ce3cf4e35c5d291c249df6ab5;hpb=c1ff83e4e8a3d887a7e313c53173fe53f9a2cd9f;p=pazpar2-moved-to-github.git diff --git a/test/test_facets.sh b/test/test_facets.sh index 4b3c276..e64b961 100755 --- a/test/test_facets.sh +++ b/test/test_facets.sh @@ -1,40 +1,10 @@ #!/bin/sh +TEST=`basename $0 .sh` # srcdir might be set by make srcdir=${srcdir:-"."} -# look for yaz-ztest in PATH -oIFS=$IFS -IFS=: -F='' -for p in $PATH; do - if test -x $p/yaz-ztest -a $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 - F=$p/yaz-ztest - break - fi - fi -done -IFS=$oIFS - -if test -z "$F"; then - echo "yaz-ztest not found that supports facets" - exit 0 -fi - -rm -f ztest.pid -$F -l ztest.log -p ztest.pid -D @:9999 -sleep 1 -if test ! -f ztest.pid; then - echo "yaz-ztest could not be started" - exit 0 -fi - -${srcdir}/run_pazpar2.sh test_facets - -kill `cat ztest.pid` -rm ztest.pid +exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST # Local Variables: # mode:shell-script