X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_facets.sh;h=e64b961e3a35dbab39fa2165795ca1d51cdec901;hb=0d45377ca625dc66907c18bb3f524f9d6c354236;hp=6f22f016cd0b47a6e930ea585a5a21f4f33eec83;hpb=93e4eeecaf4b9b964488f5d015831190e3967df4;p=pazpar2-moved-to-github.git

diff --git a/test/test_facets.sh b/test/test_facets.sh
index 6f22f01..e64b961 100755
--- a/test/test_facets.sh
+++ b/test/test_facets.sh
@@ -4,45 +4,7 @@ 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 4002042; 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
-
-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