Revert changes

[pazpar2-moved-to-github.git] / test / test_facets.sh

diff --git a/test/test_facets.sh b/test/test_facets.sh
index 22e6e04..c35bbec 100755 (executable)
--- 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,8 +9,8 @@ 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 -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
@@ -31,8 +32,13 @@ if test ! -f ztest.pid; then
     exit 0
 fi
 
-${srcdir}/run_pazpar2.sh test_facets
-E=$?
+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