Merge branch 'master' into session_lock

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

diff --git a/test/test_solr.sh b/test/test_solr.sh
index 4e96d20..b6c74e2 100755 (executable)
--- a/test/test_solr.sh
+++ b/test/test_solr.sh
@@ -3,6 +3,8 @@
 # srcdir might be set by make
 srcdir=${srcdir:-"."}
 
+TEST=`basename $0 .sh`
+
 #TODO set up solr target. For now use donut 
 #F=../solr/client.sh 
 #
@@ -14,11 +16,13 @@ srcdir=${srcdir:-"."}
 #    exit 0
 #fi
 
-${srcdir}/run_pazpar2.sh test_solr
-E=$?
-
-#kill `cat ztest.pid`
-#rm ztest.pid
+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
 exit $E
 
 # Local Variables: