X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=tests%2F_common.sh;h=04d165702941ed14a410db26ca76ea1a04ab7276;hb=4848b3853ef5517c4da4f2bcd6c8b959dae33411;hp=fa2f1077f0235c2d7d397f3403874ced12d43382;hpb=4a5968db77587c2a6d8a25901c0943e25bb39613;p=tpg%2Fopendispense2.git diff --git a/tests/_common.sh b/tests/_common.sh index fa2f107..04d1657 100644 --- a/tests/_common.sh +++ b/tests/_common.sh @@ -41,13 +41,13 @@ TRY_COMMAND() { fi } -DISPENSE="../dispense -H localhost -P ${PORT}" +DISPENSE="../dispense -f /dev/null -H localhost -P ${PORT}" LD_LIBRARY_PATH=.. ../dispsrv -f ${BASEDIR}cfg_server.conf --dont-daemonise > ${BASEDIR}server.log 2>&1 & server_pid=$! cleanup() { - if pidof dispsrv | grep ${server_pid}; then + if pidof dispsrv | grep ${server_pid} > /dev/null; then LOG "Killing ${server_pid}" kill ${server_pid}; true else