X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_facets.sh;h=b72e8da709414a4c5352190722419bedc4416b74;hb=6d01755305a7afba15ed4bc90ac9c149ee7d130e;hp=9633012be893bcfae6b8393216274a037545b333;hpb=8113b26bcf193809ba51091b2dcd964b46dc749d;p=pazpar2-moved-to-github.git

diff --git a/test/test_facets.sh b/test/test_facets.sh
index 9633012..b72e8da 100755
--- a/test/test_facets.sh
+++ b/test/test_facets.sh
@@ -1,17 +1,42 @@
 #!/bin/sh
-#
 
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-yaz-ztest -l ztest.log @:9999 & 
-ZTEST_PID=$!
-echo "ZTEST PID: $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-client; then
+	VERSION=`$p/yaz-client -V|awk '{print $3;}'|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