From: Dennis Schafroth <dennis@indexdata.com>
Date: Mon, 5 Nov 2012 14:28:53 +0000 (+0100)
Subject: Enable the yaz-ztest in the test
X-Git-Tag: v1.6.24~23^2~1
X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=29d31cc7a80dc6c40486b2af56ed85f3258348ef;p=pazpar2-moved-to-github.git

Enable the yaz-ztest in the test
---

diff --git a/test/test_termlist_block.sh b/test/test_termlist_block.sh
index e7b1203..fb9e31b 100755
--- a/test/test_termlist_block.sh
+++ b/test/test_termlist_block.sh
@@ -1,24 +1,45 @@
 #!/bin/sh
+#
 
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
-#TODO set up solr target. For now use donut 
-#F=../solr/client.sh 
-#
-#rm -f solr.pid
-#$F -l solr.log -p ztest.pid -D @:9999
-#sleep 1
-#if test ! -f ztest.pid; then
-#    echo "yaz-ztest could not be started"
-#    exit 0
-#fi
+TEST=test_termlist_block
 
-${srcdir}/run_pazpar2.sh test_termlist_block
-E=$?
+# 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
 
-#kill `cat ztest.pid`
-#rm ztest.pid
+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
+
+# Test using test_http.cfg
+${srcdir}/run_pazpar2.sh ${TEST}
+E=$?
+kill `cat ztest.pid`
+rm ztest.pid
 exit $E
 
 # Local Variables: