test/unit: use directory variables in test runner scripts

test/unit/1.sh

@@ -26,7 +26,7 @@ CFG=1.cfg
 # setup config
 echo -e "debug=2\nrequest_route {\n ; \n}" > $CFG
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/11.cfg

@@ -7,9 +7,6 @@ disable_tcp=yes
 
 alias=localhost
 
-# ------------------ module loading ----------------------------------
-loadpath "../../modules/"
-
 #!trydef DBMOD	"db_mysql"
 loadmodule DBMOD
 

test/unit/11.sh

@@ -31,7 +31,7 @@ fi ;
 
 SIPDOMAIN=127.0.0.1
 
-$BIN -w . -f $CFG -a no > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null
 ret=$?
 
 sleep 1
@@ -158,7 +158,7 @@ fi;
 $KILL
 
 # restart to test preload_udomain functionality
-$BIN -w . -f $CFG -a no> /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no> /dev/null
 ret=$?
 
 sleep 1

test/unit/12.cfg

@@ -1,8 +1,7 @@
 log_stderror=yes
 listen=127.0.0.1
-loadpath "../../modules/"
-loadmodule "../../modules/db_mysql/db_mysql.so"
-loadmodule "../../modules/tm/tm.so"
+loadmodule "db_mysql/db_mysql.so"
+loadmodule "tm/tm.so"
 loadmodule "sl"
 loadmodule "rr"
 loadmodule "maxfwd"

test/unit/12.sh

@@ -29,7 +29,7 @@ if ! (check_netcat && check_kamailio); then
 	exit 0
 fi ;
 
-$BIN -w . -f $CFG &> $TMPFILE
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG &> $TMPFILE
 ret=$?
 
 sleep 1
@@ -87,4 +87,4 @@ cat $TMPFILE
 $KILL
 rm $TMPFILE
 
-exit $ret
+exit $ret

test/unit/13.cfg

@@ -1,5 +1,4 @@
 debug=2
-loadpath "../../modules/"
 loadmodule "db_mysql"
 loadmodule "corex"
 loadmodule "tm"

test/unit/13.sh

@@ -61,7 +61,7 @@ mask, next_domain) values ('3', '2', '1', '49', 'host1.local', '503', '0', '0',
 $MYSQL "insert into carrierfailureroute(id, carrier, domain, scan_prefix, host_name, reply_code, flags,
 mask, next_domain) values ('4', '2', '2', '49', 'host1.local', '5..', '0', '0', '3');"
 
-$BIN -w . -f $CFG -a no > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null
 
 ret=$?
 

test/unit/14.cfg

@@ -1,4 +1,3 @@
-loadpath "../../modules/"
 loadmodule "sl"
 loadmodule "xlog"
 loadmodule "maxfwd"

test/unit/14.sh

@@ -30,7 +30,7 @@ fi ;
 
 cp $CFG $CFG.bak
 
-$BIN -w . -f $CFG -a no > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null
 ret=$?
 
 sleep 1

test/unit/15.sh

@@ -28,12 +28,12 @@ if ! (check_kamailio); then
 	exit 0
 fi ;
 
-echo "loadmodule \"../../modules/db_text/db_text.so\"" > $CFG
+echo "loadmodule \"db_text/db_text.so\"" > $CFG
 cat 2.cfg >> $CFG
 echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../utils/kamctl/dbtext/kamailio\")" >> $CFG
 echo -e "\nrequest_route {\n ;\n}" >> $CFG
 
-$BIN -w . -f $CFG -a no > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null
 ret=$?
 
 sleep 1

test/unit/16.sh

@@ -31,12 +31,12 @@ fi ;
 CFG=16.cfg
 
 cp 2.cfg $CFG
-echo "loadmodule \"../../modules/db_postgres/db_postgres.so\"" >> $CFG
+echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"postgres://kamailioro:kamailioro@localhost/kamailio\")" >> $CFG
 echo -e "\nrequest_route {\n ;\n}" >> $CFG
 
 # start
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/17.sh

@@ -30,7 +30,7 @@ CFG=17.cfg
 
 tmp_name=""$RANDOM"_kamailiodb_tmp"
 
-echo "loadmodule \"../../modules/db_berkeley/db_berkeley.so\"" > $CFG
+echo "loadmodule \"db_berkeley/db_berkeley.so\"" > $CFG
 cat 2.cfg >> $CFG
 echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"berkeley://`pwd`/$CTL_DIR/$tmp_name\")" >> $CFG
 echo -e "\nrequest_route {\n ;\n}" >> $CFG
@@ -53,7 +53,7 @@ ret=$?
 cd $CRT_DIR
 
 if [ "$ret" -eq 0 ] ; then
-	$BIN -w . -f $CFG -a no > /dev/null
+	$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null
 	ret=$?
 fi ;
 

test/unit/18.sh

@@ -34,7 +34,7 @@ CFG=18.cfg
 echo -e "debug=3\nrequest_route {\n ;\n}" > $CFG
 
 # start:
-$BIN -f ./$CFG -l 127.0.0.1 -n 0 -r -R -E -d -e -K -T -N 0 -b 23 -m 42 -w . -u $(id -u) -g $(id -g) -P ./pid.out -G ./pgid.out -a no -A TESTDEF > /dev/null 2>&1
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -f ./$CFG -l 127.0.0.1 -n 0 -r -R -E -d -e -K -T -N 0 -b 23 -m 42 -w . -u $(id -u) -g $(id -g) -P ./pid.out -G ./pgid.out -a no -A TESTDEF > /dev/null 2>&1
 
 ret=$?
 

test/unit/19.cfg

@@ -10,7 +10,6 @@ dns=no
 rev_dns=no
 
 #-----------------------Loading Modules-------------------------------------
-loadpath "../../modules/:../../modules_k/"
 loadmodule "tm"
 loadmodule "db_mysql"
 loadmodule "usrloc"

test/unit/19.sh

@@ -36,7 +36,7 @@ UAC=5080
 # add an registrar entry to the db;
 $MYSQL "INSERT INTO location (ruid,username,contact,socket,user_agent,cseq,q) VALUES (\"kamailio-unit-uid\", \"foo\",\"sip:foo@localhost:$UAS\",\"udp:127.0.0.1:$UAS\",\"kamailio_test\",1,-1);"
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 sipp -sn uas -bg -i localhost -m 10 -f 2 -p $UAS &> /dev/null
 sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -f 2 -p $UAC &> /dev/null
 

test/unit/2.cfg

@@ -1,12 +1,11 @@
 debug=2
-mpath="../../modules/"
-loadmodule "../../modules/tm/tm.so"
+loadmodule "tm/tm.so"
 loadmodule "tmx"
 loadmodule "acc"
 loadmodule "alias_db"
 loadmodule "auth"
 loadmodule "auth_db"
-loadmodule "../../modules/avpops/avpops.so"
+loadmodule "avpops/avpops.so"
 loadmodule "benchmark"
 loadmodule "cfgutils"
 loadmodule "dialog"
@@ -14,9 +13,9 @@ loadmodule "dispatcher"
 loadmodule "diversion"
 loadmodule "domain"
 loadmodule "domainpolicy"
-loadmodule "../../modules/enum/enum.so"
+loadmodule "enum/enum.so"
 loadmodule "exec"
-loadmodule "../../modules/db_flatstore/db_flatstore.so"
+loadmodule "db_flatstore/db_flatstore.so"
 loadmodule "group"
 loadmodule "htable"
 loadmodule "imc"
@@ -48,9 +47,9 @@ loadmodule "registrar"
 loadmodule "permissions"
 loadmodule "pdt"
 loadmodule "pv"
-loadmodule "../../modules/rtpproxy/rtpproxy.so"
+loadmodule "rtpproxy/rtpproxy.so"
 loadmodule "xlog"
-loadmodule "../../modules/pdb/pdb.so"
+loadmodule "pdb/pdb.so"
 
 modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
 modparam("mi_datagram", "socket_name", "/tmp/kamailio.sock")

test/unit/2.sh

@@ -35,12 +35,12 @@ cp $CFG $CFG.bak
 
 touch dispatcher.list
 
-echo "loadmodule \"$SRC_DIR/modules/db_mysql/db_mysql.so\"" >> $CFG
-echo "modparam(\"dispatcher\", \"list_file\", \"$SRC_DIR/$TEST_DIR/dispatcher.list\")" >> $CFG
+echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
+echo "modparam(\"dispatcher\", \"list_file\", \"dispatcher.list\")" >> $CFG
 echo -e "\nrequest_route {\n ;\n}" >> $CFG
 
 # start
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/20.cfg

@@ -10,7 +10,6 @@ dns=yes
 rev_dns=no
 
 #-----------------------Loading Modiules-------------------------------------
-loadpath "../../modules/"
 loadmodule "tm"
 loadmodule "db_mysql"
 loadmodule "usrloc/usrloc.so"

test/unit/20.sh

@@ -35,7 +35,7 @@ $MYSQL "INSERT INTO location (ruid, username,contact,socket,user_agent,cseq,q) V
 
 sipp -sn uas -bg -i 127.0.0.1 -m 1 -f 10 -p 5060 &> /dev/null
 
-$BIN -w . -f $CFG > $TMPFILE 2>&1
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > $TMPFILE 2>&1
 
 sipp -sn uac -s foo 127.0.0.1:5059 -i 127.0.0.1 -m 1 -f 10 -p 5061 &> /dev/null
 

test/unit/21.cfg

@@ -19,9 +19,6 @@ rev_dns=no
 
 # ------------------ module loading ----------------------------------
 
-#set module path
-loadpath "../../modules/"
-
 # Uncomment this if you want to use SQL database
 loadmodule "db_mysql/db_mysql.so"
 

test/unit/21.sh

@@ -33,7 +33,7 @@ CFG=21.cfg
 # add an registrar entry to the db;
 $MYSQL "INSERT INTO subscriber (username, domain, password) VALUES (\"alice\",\"localhost\",\"alice\");"
 
-$BIN -w . -f $CFG -E -e -dd > /dev/null 2>&1
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -E -e -dd > /dev/null 2>&1
 ret=$?
 
 sleep 1

test/unit/22.cfg

@@ -8,7 +8,6 @@ disable_tcp=yes
 alias=localhost
 
 # ------------------ module loading ----------------------------------
-loadpath "../../modules/"
 loadmodule "db_postgres"
 loadmodule "tm"
 loadmodule "sl"

test/unit/22.sh

@@ -30,7 +30,7 @@ fi ;
 SIPDOMAIN=127.0.0.1
 CFG=22.cfg
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/23.sh

@@ -32,7 +32,7 @@ CFG=13.cfg
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"../../modules/db_postgres/db_postgres.so\"" >> $CFG
+echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"db_url\", \"postgres://kamailioro:kamailioro@localhost/kamailio\")" >> $CFG
 
@@ -51,7 +51,7 @@ insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite
 insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('20','2','','10','1','0','host6');
 insert into carrierroute (id, carrier, scan_prefix, domain, prob, strip, rewrite_host) values ('21','3','','10','1','0','premium.host.local');"
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
@@ -101,4 +101,4 @@ delete from carrierroute where carrier=3;"
 mv $CFG.bak $CFG
 rm $TMPFILE
 
-exit $ret
+exit $ret

test/unit/25.cfg

@@ -2,7 +2,6 @@ debug=0
 listen=127.0.0.1
 port=5059
 
-loadpath "../../modules_k/:../../modules/"
 loadmodule "tm/tm.so"
 loadmodule "sl/sl.so"
 loadmodule "usrloc/usrloc.so"

test/unit/25.sh

@@ -77,7 +77,7 @@ $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('1'
 $MYSQL "insert into globalblacklist (prefix, whitelist, description) values ('','0','_test_');"
 
 
-$BIN -w . -f $CFG > /dev/null 2>&1
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null 2>&1
 sleep 1
 
 sipp -sn uas -bg -i 127.0.0.1 -p 5060 #&> /dev/null

test/unit/26.cfg

@@ -1,7 +1,6 @@
 debug=3
 memdbg=6
 memlog=6
-loadpath "../../modules/:../../modules_k/"
 loadmodule "sl"
 loadmodule "tm"
 loadmodule "tmx"

test/unit/26.sh

@@ -32,7 +32,7 @@ CFG=26.cfg
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG
+echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 # setup database
@@ -74,7 +74,7 @@ $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('4972112
 $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('49721123456785', 3);"
 
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 
 ret=$?
 
@@ -147,4 +147,4 @@ $MYSQL "alter table subscriber drop cr_preferred_carrier;"
 
 mv $CFG.bak $CFG
 
-exit $ret
+exit $ret

test/unit/27.sh

@@ -31,7 +31,7 @@ fi ;
 
 CFG=presence.cfg
 
-$BIN -w . -f $CFG -a no >/dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no >/dev/null
 ret=$?
 sleep 1
 

test/unit/28.cfg

@@ -1,6 +1,5 @@
 debug=3
 
-loadpath "../../modules/"
 loadmodule "sl.so"
 loadmodule "tm/tm.so"
 loadmodule "db_mysql/db_mysql.so"

test/unit/28.sh

@@ -32,7 +32,7 @@ CPL=cpl_ignore.xml
 TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 
-$BIN -w . -f $CFG -a no >/dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no >/dev/null
 ret=$?
 sleep 1
 

test/unit/29.sh

@@ -31,11 +31,11 @@ CPL=cpl_ignore.xml
 TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 cp $CFG $CFG.tmp
-echo "loadmodule \"../../modules/db_postgres/db_postgres.so\"" >> $CFG
+echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"cpl-c\", \"db_url\", \"postgres://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 
 
-$BIN -w . -f $CFG >/dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG >/dev/null
 ret=$?
 sleep 1
 

test/unit/30.cfg

@@ -1,11 +1,10 @@
 debug=2
-loadpath "../../modules/:../../modules_k/"
 loadmodule "sl"
-loadmodule "../../modules/tm/tm.so"
+loadmodule "tm/tm.so"
 loadmodule "xlog"
 loadmodule "maxfwd"
 loadmodule "pv"
-loadmodule "../../modules/carrierroute/carrierroute.so"
+loadmodule "carrierroute/carrierroute.so"
 
 route{
 	# initial sanity checks

test/unit/30.sh

@@ -35,7 +35,7 @@ cp $CFG $CFG.bak
 echo "modparam(\"carrierroute\", \"config_file\", \"carrierroute-2.cfg\")" >> $CFG
 
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 
 ret=$?
 
@@ -67,4 +67,4 @@ killall -9 sipp
 
 mv $CFG.bak $CFG
 
-exit $ret
+exit $ret

test/unit/31.sh

@@ -39,7 +39,7 @@ while [  $COUNTER -lt $NR ]; do
 	$MYSQL "insert into location (ruid, username, domain, contact, user_agent) values ('ul-ruid-$COUNTER', 'foobar-$RANDOM', '$DOMAIN', 'sip:foobar-$RANDOM@$DOMAIN', '___test___');"
 done
 
-$BIN -w . -f $CFG -A FETCHROWS=17 -a no >/dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -A FETCHROWS=17 -a no >/dev/null
 ret=$?
 
 sleep 1

test/unit/32.sh

@@ -35,7 +35,7 @@ NR=25
 
 cp $CFG $CFG.bak
 
-echo "loadmodule \"../../modules/db_postgres/db_postgres.so\"" >> $CFG
+echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"usrloc\", \"db_url\", \"postgres://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG
 
@@ -46,7 +46,7 @@ while [  $COUNTER -lt $NR ]; do
 	$PSQL "insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___'); insert into location (username, domain, contact, user_agent) values ('foobar-$RANDOM', '$DOMAIN', 'foobar-$RANDOM@$DOMAIN', '___test___');"
 done
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/33.cfg

@@ -1,6 +1,5 @@
 debug=3
 memlog=2
-loadpath "../../modules/"
 loadmodule "cfgutils.so"
 loadmodule "pv.so"
 loadmodule "xlog.so"

test/unit/33.sh

@@ -37,7 +37,7 @@ cp $CFG $CFG.bak
 
 ulimit -c unlimited
 
-$BIN -w . -f $CFG -a no > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -a no > /dev/null
 ret=$?
 
 sleep 1

test/unit/34.cfg

@@ -1,4 +1,3 @@
-loadpath "../../modules_k:../../modules"
 loadmodule "tm/tm.so"
 loadmodule "sl.so"
 loadmodule "usrloc.so"

test/unit/34.sh

@@ -40,10 +40,10 @@ fi ;
 
 cp $CFG $CFG.bak
 
-echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG
+echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 
 # start
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
@@ -51,4 +51,4 @@ $KILL
 
 mv $CFG.bak $CFG
 
-exit $ret
+exit $ret

test/unit/35.cfg

@@ -10,7 +10,6 @@ dns=no
 rev_dns=no
 
 #-----------------------Loading Modules-------------------------------------
-mpath="../modules/"
 loadmodule "db_mysql/db_mysql.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"

test/unit/35.sh

@@ -40,7 +40,7 @@ $MYSQL "INSERT INTO trusted (src_ip, proto) VALUES (\"127.0.0.1\",\"any\");"
 
 $MYSQL "INSERT INTO address (ip_addr, mask) VALUES ('$IP', '$MASK');"
 
-../$BIN -w . -f $CFG &> /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG &> /dev/null
 sipp -sn uas -bg -i localhost -m 10 -f 2 -p $UAS &> /dev/null
 sipp -sn uac -s foo 127.0.0.1:$SRV -i localhost -m 10 -f 2 -p $UAC &> /dev/null
 ret=$?

test/unit/36.sh

@@ -31,10 +31,10 @@ CFG=11.cfg
 
 cp $CFG $CFG.bak
 
-echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG
+echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 
 # 1768 contacts should fit into 1 MB of PKG memory
-$BIN -V | grep "PKG_MALLOC" > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -V | grep "PKG_MALLOC" > /dev/null
 if [ $? -eq 0 ]; then
 	NR=176
 else
@@ -56,7 +56,7 @@ while [  $COUNTER -lt $NR ]; do
 	insert into location (username, domain, contact, user_agent) values ('foobar-$COUNTER-$RANDOM', 'local', 'foobar-$COUNTER-$RANDOM@$DOMAIN', '___test___');"
 done
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 if [ $ret -eq 0 ]; then

test/unit/37.sh

@@ -36,7 +36,7 @@ fi ;
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG
+echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 
 # setup database
@@ -62,7 +62,7 @@ while [  $COUNTER -lt $NR ]; do
 
 done
 
-$BIN -m 128 -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -m 128 -w . -f $CFG > /dev/null
 ret=$?
 
 # adjust if you have bigger rule sets

test/unit/38.sh

@@ -36,7 +36,7 @@ echo "loadmodule \"db_unixodbc/db_unixodbc.so\"" >> $CFG
 echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"unixodbc://kamailioro:kamailioro@localhost/kamailio\")" >> $CFG
 
 # start
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/39.sh

@@ -36,7 +36,7 @@ NR=25
 
 cp $CFG $CFG.bak
 
-echo "loadmodule \"$SRC_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG
+echo "loadmodule \"db_unixodbc/db_unixodbc.so\"" >> $CFG
 echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG
 
@@ -49,7 +49,7 @@ while [  $COUNTER -lt $NR ]; do
 	CNT=$(($CNT+10))
 done
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 2

test/unit/4.sh

@@ -29,13 +29,13 @@ if ! (check_kamailio); then
 fi ;
 
 # setup config
-echo -e "loadmodule \"$SRC_DIR/modules/mi_fifo/mi_fifo.so\"" > $CFG
-echo -e "loadmodule \"$SRC_DIR/modules/kex/kex.so\"" >> $CFG
+echo -e "loadmodule \"mi_fifo/mi_fifo.so\"" > $CFG
+echo -e "loadmodule \"kex/kex.so\"" >> $CFG
 echo -e "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/kamailio_fifo\")" >> $CFG
 echo -e "\nrequest_route {\n ;\n}" >> $CFG
 
         
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 if [ "$ret" -eq 0 ] ; then

test/unit/40.cfg

@@ -1,6 +1,3 @@
-
-loadpath "../../modules_k:../../modules/"
-
 loadmodule "tm/tm.so"
 loadmodule "sl/sl.so"
 loadmodule "db_mysql/db_mysql.so"

test/unit/40.sh

@@ -38,7 +38,7 @@ fi ;
 $MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:[email protected]:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);"
 
 # start
-$BIN -w . -f $CFG &> /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG &> /dev/null
 ret=$?
 
 # this should work
@@ -70,4 +70,4 @@ $KILL
 killall -9 sipp > /dev/null 2>&1
 
 $MYSQL "DELETE FROM location WHERE ((contact = \"sip:[email protected]:$UAS\") and (user_agent = \"ser_test\"));"
-exit $ret
+exit $ret

test/unit/41.cfg

@@ -1,7 +1,6 @@
 #memlog=1
 debug=1
 children=1
-loadpath "../../modules_k:../../modules/"
 
 loadmodule "tm/tm.so"
 loadmodule "sl/sl.so"

test/unit/41.sh

@@ -44,7 +44,7 @@ $MYSQL "INSERT INTO usr_preferences (uuid, attribute, type, value) VALUES (\"foo
 
 # start
 
-$BIN -w . -f $CFG &> /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG &> /dev/null
 ret=$?
 
 if [ "$ret" -eq 0 ]; then

test/unit/42.sh

@@ -32,7 +32,7 @@ CFG=26.cfg
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >> $CFG
+echo "loadmodule \"db_mysql/db_mysql.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"match_mode\", 128)" >> $CFG
 
@@ -75,7 +75,7 @@ $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('ab4-123
 $MYSQL "insert into subscriber (username, cr_preferred_carrier) values ('ab4-123456785', 3);"
 
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 
 ret=$?
 
@@ -145,4 +145,4 @@ $MYSQL "alter table subscriber drop cr_preferred_carrier;"
 
 mv $CFG.bak $CFG
 
-exit $ret
+exit $ret

test/unit/43.sh

@@ -30,16 +30,15 @@ fi ;
 CFG=43.cfg
 TMPFILE=`mktemp -t kamailio-test.XXXXXXXXX`
 # setup config
-echo "mpath=\"../../modules\"" > $CFG
-echo "loadmodule \"../../modules/tm/tm.so\"" >> $CFG
+echo "loadmodule \"tm/tm.so\"" > $CFG
 echo "loadmodule \"sl/sl.so\"" >> $CFG
 echo "loadmodule \"mi_fifo/mi_fifo.so\"" >> $CFG
-echo "loadmodule \"../../modules/utils/utils.so\"" >> $CFG
+echo "loadmodule \"utils/utils.so\"" >> $CFG
 echo "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/kamailio_fifo\")" >> $CFG
 echo "modparam(\"utils\", \"forward_active\", 1)" >> $CFG
 echo "route {sl_send_reply(\"404\", \"forbidden\");}" >> $CFG
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 
 
 ret=$?

test/unit/44.sh

@@ -30,10 +30,10 @@ fi ;
 CFG=11.cfg
 
 cp $CFG $CFG.tmp
-echo "loadmodule \"$SRC_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG
+echo "loadmodule \"db_unixodbc/db_unixodbc.so\"" >> $CFG
 echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
@@ -83,7 +83,7 @@ fi;
 $KILL
 
 # restart to test preload_udomain functionality
-$BIN -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/45.cfg

@@ -10,12 +10,11 @@ dns=no
 rev_dns=no
 
 #-----------------------Loading Modules-------------------------------------
-mpath="../../modules/"
-loadmodule "../../modules/db_mysql/db_mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"
 loadmodule "sl/sl.so"
-loadmodule "../../modules/tm/tm.so"
+loadmodule "tm/tm.so"
 loadmodule "maxfwd/maxfwd.so"
 loadmodule "pv/pv.so"
 loadmodule "cfgutils.so"

test/unit/45.sh

@@ -36,7 +36,7 @@ UAC=5080
 # add an registrar entry to the db;
 $MYSQL "INSERT INTO location (username,contact,socket,user_agent,cseq,q) VALUES (\"foo\",\"sip:[email protected]:$UAS\",\"udp:127.0.0.1:$UAS\",\"ser_test\",1,-1);"
 
-$BIN -w . -f $CFG &> /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG &> /dev/null
 
 sipp -sn uas -bg -i 127.0.0.1 -m 10 -f 2 -p $UAS &> /dev/null
 sipp -sn uac -s foo 127.0.0.1:$SRV -i 127.0.0.1 -m 10 -f 2 -p $UAC &> /dev/null

test/unit/46.sh

@@ -67,10 +67,10 @@ function test_module_int()
 # add an registrar entry to the db
 cp $CFG ${CFG}.bak
 
-echo "loadmodule \"../../modules/db_mysql/db_mysql.so\"" >>$CFG
-echo "loadmodule \"../../modules/ctl/ctl.so\"" >> $CFG
-echo "loadmodule \"../../modules/cfg_rpc/cfg_rpc.so\"" >> $CFG
-$BIN -w . -f $CFG &> /dev/null
+echo "loadmodule \"db_mysql/db_mysql.so\"" >>$CFG
+echo "loadmodule \"ctl/ctl.so\"" >> $CFG
+echo "loadmodule \"cfg_rpc/cfg_rpc.so\"" >> $CFG
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG &> /dev/null
 ret=$?
 sleep 1
 

test/unit/5.cfg

@@ -59,12 +59,9 @@ port=5060
 
 ####### Modules Section ########
 
-#set module path
-mpath="../../modules_k"
-
 /* uncomment next line for MySQL DB support */
 #loadmodule "db_mysql.so"
-loadmodule "../../modules/tm/tm.so"
+loadmodule "tm/tm.so"
 loadmodule "sl/sl.so"
 loadmodule "rr/rr.so"
 loadmodule "pv/pv.so"

test/unit/5.sh

@@ -24,7 +24,7 @@
 source include/common
 source include/require
 
-CFG=$SRC_DIR/etc/kamailio.cfg
+CFG=$TOP_DIR/etc/kamailio.cfg
 
 if ! (check_kamailio); then
 	exit 0
@@ -32,7 +32,7 @@ fi ;
         
 
 # start
-$BIN -w . -L $SRC_DIR/modules/ -f $CFG -A WITH_SRCPATH -a no > /dev/null 2>&1
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG -A WITH_SRCPATH -a no > /dev/null 2>&1
 ret=$?
 
 sleep 1

test/unit/50.cfg

@@ -6,7 +6,6 @@ children=1
 disable_tcp=yes
 
 # ------------------ module loading ----------------------------------
-loadpath "../../modules/:../../modules_k/"
 loadmodule "tm"
 loadmodule "sl"
 loadmodule "rr"
@@ -14,7 +13,7 @@ loadmodule "maxfwd"
 loadmodule "textops"
 loadmodule "xlog"
 loadmodule "pv"
-loadmodule "../../modules/db_mysql/db_mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 
 loadmodule "mi_fifo"
 modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")

test/unit/50.sh

@@ -33,7 +33,7 @@ MYSQL_LOC_A="mysql loc_a --show-warnings --batch --user=ser --password=ser -e"
 MYSQL_LOC_B="mysql loc_b --show-warnings --batch --user=ser --password=ser  -e"
 cp $CFG $CFG.bak
 
-$BIN -w . -f $CFG #> /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f $CFG #> /dev/null
 ret=$?
 
 sleep 1
@@ -159,4 +159,4 @@ $KILL
 
 mv $CFG.bak $CFG
 
-exit $ret
+exit $ret

test/unit/6.sh

@@ -29,7 +29,7 @@ if ! (check_kamailio); then
 fi ;
 
 # start
-cat $CFG | cat - route-empty.cfg | $BIN -w . -a no -c -f - > /dev/null 2>&1
+cat $CFG | cat - route-empty.cfg | $BIN -L $MOD_DIR -w . -a no -c -f - > /dev/null 2>&1
 ret=$?
 
 exit $ret

test/unit/60.cfg

@@ -8,8 +8,6 @@ listen=udp:127.0.0.1:5060
 auto_aliases=no
 alias=example.invalid
 # ------------------ module loading ----------------------------------
-loadpath "../../modules/"
-
 loadmodule "tm.so"
 loadmodule "sl.so"
 loadmodule "pv.so"

test/unit/60.sh

@@ -28,7 +28,7 @@ if ! (check_sipsak && check_kamailio && check_module "sdpops"); then
 	exit 0
 fi
 
-${BIN} -w ${RUN_DIR} -Y ${RUN_DIR} -P ${PIDFILE} -f ${CFGFILE} > /dev/null
+${BIN} -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE  -w . -f ${CFGFILE} > /dev/null
 ret=$?
 
 sleep 1

test/unit/61.cfg

@@ -8,8 +8,6 @@ listen=udp:127.0.0.1:5060
 auto_aliases=no
 alias=example.invalid
 # ------------------ module loading ----------------------------------
-loadpath "../../modules/"
-
 loadmodule "sl.so"
 loadmodule "pv.so"
 loadmodule "textops.so"

test/unit/61.sh

@@ -34,7 +34,7 @@ if ! (check_sipsak && check_kamailio && check_module "sdpops" && check_module "a
 	exit 0
 fi
 
-${BIN} -w ${RUN_DIR} -Y ${RUN_DIR} -P ${PIDFILE} -f ${CFGFILE} > /dev/null
+${BIN} -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -w . -f ${CFGFILE} > /dev/null
 ret=$?
 
 sleep 1

test/unit/7.cfg

@@ -100,7 +100,6 @@
 ########################################################################
 
 listen = udp:127.0.0.1:5060
-mpath = "../../modules"
 children = 8
 debug = 2
 fork = yes

test/unit/7.sh

@@ -33,7 +33,7 @@ if ! (check_kamailio); then
 fi ;
 
 # start
-$BIN -a no -w . -f $CFG > /dev/null
+$BIN -L $MOD_DIR -Y $RUN_DIR -P $PIDFILE -a no -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1

test/unit/presence.cfg

@@ -19,9 +19,6 @@ rev_dns=no
 
 # ------------------ module loading ----------------------------------
 
-#set module path
-mpath="../../modules/"
-
 loadmodule "db_mysql/db_mysql.so"
 loadmodule "sl/sl.so"
 loadmodule "maxfwd/maxfwd.so"