X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=test%2Ftest_facets.sh;h=89839e23701b7e10bf6efc47d28f41558d987e1b;hb=462089bdf361d5bf803e10026718606cec9b2fcc;hp=4b3c2767445c027ce3cf4e35c5d291c249df6ab5;hpb=c1ff83e4e8a3d887a7e313c53173fe53f9a2cd9f;p=pazpar2-moved-to-github.git diff --git a/test/test_facets.sh b/test/test_facets.sh index 4b3c276..89839e2 100755 --- a/test/test_facets.sh +++ b/test/test_facets.sh @@ -8,7 +8,7 @@ oIFS=$IFS IFS=: F='' for p in $PATH; do - if test -x $p/yaz-ztest -a $p/yaz-config; then + 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 $VERSION -ge 4000012; then F=$p/yaz-ztest @@ -24,7 +24,7 @@ if test -z "$F"; then fi rm -f ztest.pid -$F -l ztest.log -p ztest.pid -D @:9999 +$F -l ztest.log -p ztest.pid -D tcp:localhost:9999 sleep 1 if test ! -f ztest.pid; then echo "yaz-ztest could not be started" @@ -32,9 +32,11 @@ if test ! -f ztest.pid; then fi ${srcdir}/run_pazpar2.sh test_facets +E=$? kill `cat ztest.pid` rm ztest.pid +exit $E # Local Variables: # mode:shell-script