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
Remove file not in use by tests
[pazpar2-moved-to-github.git]
/
test
/
test_termlist_block.sh
diff --git
a/test/test_termlist_block.sh
b/test/test_termlist_block.sh
index
fb9e31b
..
dbe89d9
100755
(executable)
--- a/
test/test_termlist_block.sh
+++ b/
test/test_termlist_block.sh
@@
-4,7
+4,7
@@
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-TEST=test_termlist_block
+TEST=`basename $0 .sh`
# look for yaz-ztest in PATH
oIFS=$IFS
# look for yaz-ztest in PATH
oIFS=$IFS
@@
-13,7
+13,7
@@
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;}'`
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
+ if test $VERSION -ge 4002052; then
F=$p/yaz-ztest
break
fi
F=$p/yaz-ztest
break
fi
@@
-35,9
+35,14
@@
if test ! -f ztest.pid; then
exit 0
fi
exit 0
fi
-# Test using test_http.cfg
-${srcdir}/run_pazpar2.sh ${TEST}
-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