X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_facets.sh;h=e64b961e3a35dbab39fa2165795ca1d51cdec901;hb=5a140827dbe220d4cf354a64dba8a3c96c29ab66;hp=89839e23701b7e10bf6efc47d28f41558d987e1b;hpb=4950aaf37c673f141162f2c1e663feb6a0267230;p=pazpar2-moved-to-github.git diff --git a/test/test_facets.sh b/test/test_facets.sh index 89839e2..e64b961 100755 --- a/test/test_facets.sh +++ b/test/test_facets.sh @@ -1,42 +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 -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 - 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 tcp:localhost: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 -E=$? - -kill `cat ztest.pid` -rm ztest.pid -exit $E +exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST # Local Variables: # mode:shell-script