X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=test%2Ftest_facets.sh;h=c35bbec1f0c8f8974a029147146b5578a2750913;hb=16c571a7e5b4e9b96a729a5b4aee373f7347375c;hp=4b3c2767445c027ce3cf4e35c5d291c249df6ab5;hpb=c1ff83e4e8a3d887a7e313c53173fe53f9a2cd9f;p=pazpar2-moved-to-github.git

diff --git a/test/test_facets.sh b/test/test_facets.sh
index 4b3c276..c35bbec 100755
--- a/test/test_facets.sh
+++ b/test/test_facets.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
 
+TEST=`basename $0 .sh`
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
@@ -8,9 +9,9 @@ oIFS=$IFS
 IFS=:
 F=''
 for p in $PATH; do
-    if test -x $p/yaz-ztest -a $p/yaz-config; then
-	VERSION=`$p/yaz-config -V|awk 'BEGIN { FS = "."; } { printf "%d", ($1 * 1000 + $2) * 1000 + $3;}'`
-	if test $VERSION -ge 4000012; then
+    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
@@ -24,17 +25,24 @@ if test -z "$F"; then
 fi
 
 rm -f ztest.pid
-$F -l ztest.log -p ztest.pid -D @:9999
+$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
 
-${srcdir}/run_pazpar2.sh test_facets
+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:
 # mode:shell-script