projects
/
pazpar2-moved-to-github.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4ae1e86
)
Enable the yaz-ztest in the test
author
Dennis Schafroth
<dennis@indexdata.com>
Mon, 5 Nov 2012 14:28:53 +0000
(15:28 +0100)
committer
Dennis Schafroth
<dennis@indexdata.com>
Mon, 5 Nov 2012 14:28:53 +0000
(15:28 +0100)
test/test_termlist_block.sh
patch
|
blob
|
history
diff --git
a/test/test_termlist_block.sh
b/test/test_termlist_block.sh
index
e7b1203
..
fb9e31b
100755
(executable)
--- a/
test/test_termlist_block.sh
+++ b/
test/test_termlist_block.sh
@@
-1,24
+1,45
@@
#!/bin/sh
#!/bin/sh
+#
# srcdir might be set by make
srcdir=${srcdir:-"."}
# srcdir might be set by make
srcdir=${srcdir:-"."}
-#TODO set up solr target. For now use donut
-#F=../solr/client.sh
-#
-#rm -f solr.pid
-#$F -l solr.log -p ztest.pid -D @:9999
-#sleep 1
-#if test ! -f ztest.pid; then
-# echo "yaz-ztest could not be started"
-# exit 0
-#fi
+TEST=test_termlist_block
-${srcdir}/run_pazpar2.sh test_termlist_block
-E=$?
+# look for yaz-ztest in PATH
+oIFS=$IFS
+IFS=:
+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;}'`
+ if test $VERSION -ge 4000000; then
+ F=$p/yaz-ztest
+ break
+ fi
+ fi
+done
+IFS=$oIFS
-#kill `cat ztest.pid`
-#rm ztest.pid
+if test -z "$F"; then
+ echo "yaz-ztest not found"
+ exit 0
+fi
+
+rm -f ztest.pid
+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
+
+# Test using test_http.cfg
+${srcdir}/run_pazpar2.sh ${TEST}
+E=$?
+kill `cat ztest.pid`
+rm ztest.pid
exit $E
# Local Variables:
exit $E
# Local Variables: