projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disabling Solr tests
[pazpar2-moved-to-github.git]
/
test
/
test_filter.sh
diff --git
a/test/test_filter.sh
b/test/test_filter.sh
index
07e7747
..
ff745df
100755
(executable)
--- a/
test/test_filter.sh
+++ b/
test/test_filter.sh
@@
-4,6
+4,7
@@
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
+TEST=`basename $0 .sh`
# look for yaz-ztest in PATH
oIFS=$IFS
# look for yaz-ztest in PATH
oIFS=$IFS
@@
-26,16
+27,22
@@
if test -z "$F"; then
fi
rm -f ztest.pid
fi
rm -f ztest.pid
-$F -l ztest.log -p ztest.pid -D tcp:localhost:9999
+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
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_filter
-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
exit $E
kill `cat ztest.pid`
rm ztest.pid
exit $E