X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_facets.sh;h=22e6e040c31a509927b469a12ca4758b479982a0;hb=1fc1b045b89c4122c305aa0127c06dde4dc4d0a8;hp=13b20d4205d30dc007e14fc119c9a19310433bd7;hpb=45785bd04a031ea86423af67a7498b61a9bf3d87;p=pazpar2-moved-to-github.git

diff --git a/test/test_facets.sh b/test/test_facets.sh
index 13b20d4..22e6e04 100755
--- a/test/test_facets.sh
+++ b/test/test_facets.sh
@@ -1,16 +1,42 @@
 #!/bin/sh
-#
 
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-yaz-ztest -l ztest.log @:9999 & 
-ZTEST_PID=$!
+# 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 4002000; 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
 
-# Test using test_http.cfg
 ${srcdir}/run_pazpar2.sh test_facets
+E=$?
 
-kill $ZTEST_PID
+kill `cat ztest.pid`
+rm ztest.pid
+exit $E
 
 # Local Variables:
 # mode:shell-script