Allow predictable sessions PAZ-1030

[pazpar2-moved-to-github.git] / test / test_filter.sh

diff --git a/test/test_filter.sh b/test/test_filter.sh
index ff745df..e64b961 100755 (executable)
--- a/test/test_filter.sh
+++ b/test/test_filter.sh
@@ -1,51 +1,10 @@
 #!/bin/sh
-#
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-TEST=`basename $0 .sh`
-
-# 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
-rm -f ${TEST}_ztest.log
-$F -l ${TEST}_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
-
-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
+exec ${srcdir}/run_pazpar2.sh --ztest --icu $TEST
 
 # Local Variables:
 # mode:shell-script