X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_termlist_block.sh;h=ff745df3ed3880d2c8fb48d8b12abf45dfb1094d;hb=0bb0ee0e00d750808e228b991c78cb4838bc989d;hp=e7b120336dd10f609150ed5c6e2c29efb045fc84;hpb=4c01f5ad1ee26d836f731a5d5f2f6c0c9f025ba0;p=pazpar2-moved-to-github.git

diff --git a/test/test_termlist_block.sh b/test/test_termlist_block.sh
index e7b1203..ff745df 100755
--- a/test/test_termlist_block.sh
+++ b/test/test_termlist_block.sh
@@ -1,24 +1,50 @@
 #!/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
-
-${srcdir}/run_pazpar2.sh test_termlist_block
-E=$?
-
-#kill `cat ztest.pid`
-#rm ztest.pid
+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
 
 # Local Variables: