Module: sip-router Branch: master Commit: 4e24dac93e905cd055b9fabc3cce49071f911b9b URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=4e24dac… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: Tue Sep 30 17:32:58 2014 +0200 test/unit: kill using application name - on some OS, killall with full path doesn't work - kamailio is searched first, being default flavour now --- test/unit/include/common | 14 ++++++++------ 1 files changed, 8 insertions(+), 6 deletions(-) diff --git a/test/unit/include/common b/test/unit/include/common index d918496..cab5637 100644 --- a/test/unit/include/common +++ b/test/unit/include/common @@ -7,15 +7,17 @@ CTLRC="$CTL_DIR/kamctlrc" CTL="$CTL_DIR/kamctl" DBCTL="$CTL_DIR/kamdbctl" BIN="$SR_DIR/ser" -if [ -f $SR_DIR/ser ] ; then - BIN="$SR_DIR/ser" +if [ -f $SR_DIR/kamailio ] ; then + BIN="$SR_DIR/kamailio" + BNAME="kamailio" else - if [ -f $SR_DIR/kamailio ] ; then - BIN="$SR_DIR/kamailio" + if [ -f $SR_DIR/ser ] ; then + BIN="$SR_DIR/ser" + BNAME="ser" else - echo "WARNING Binary not found!" + echo "WARNING Binary not found!" fi fi -KILL="killall -15 $BIN" +KILL="killall -15 $BNAME" # test directory relative to root TEST_DIR="test/unit"