X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_filter.sh;h=e64b961e3a35dbab39fa2165795ca1d51cdec901;hb=3895572f92f283f91e8b30064c11ee55dfd078c9;hp=07e774750fd5895751397da16df83ee9b6906a66;hpb=405c024aa13c4a2659d33131a72acc95538547b3;p=pazpar2-moved-to-github.git diff --git a/test/test_filter.sh b/test/test_filter.sh index 07e7747..e64b961 100755 --- a/test/test_filter.sh +++ b/test/test_filter.sh @@ -1,44 +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-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 - F=$p/yaz-ztest - break - fi - fi -done -IFS=$oIFS - -if test -z "$F"; then - echo "yaz-ztest not found" - 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 - -# Test using test_http.cfg -${srcdir}/run_pazpar2.sh test_filter -E=$? -kill `cat ztest.pid` -rm ztest.pid -exit $E +exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST # Local Variables: # mode:shell-script