test/unit: Cleaned up cfg for unit tests

As modules migrate from modules_k/ to modules/ using relative path in loadmodule statement becomes difficult,
so both modules/ and modules_k/ path are searched.

test/unit/12.cfg

@@ -1,6 +1,6 @@
 log_stderror=yes
 listen=127.0.0.1
-loadpath "../../modules_k/"
+loadpath "../../modules/:../../modules_k/"
 loadmodule "../../modules/db_mysql/db_mysql.so"
 loadmodule "../../modules/tm/tm.so"
 loadmodule "sl"

test/unit/13.cfg

@@ -1,10 +1,10 @@
 debug=2
-loadpath "../../modules_k"
+loadpath "../../modules/:../../modules_k/"
 loadmodule "sl"
-loadmodule "../../modules/tm/tm.so"
+loadmodule "tm"
 loadmodule "xlog"
 loadmodule "maxfwd"
-loadmodule "../../modules/carrierroute/carrierroute.so"
+loadmodule "carrierroute"
 loadmodule "pv"
 loadmodule "tmx"
 loadmodule "mi_fifo"

test/unit/14.cfg

@@ -1,8 +1,8 @@
-loadpath "../../modules_k"
+loadpath "../../modules/:../../modules_k/"
 loadmodule "sl"
 loadmodule "xlog"
 loadmodule "maxfwd"
-loadmodule "../../modules/carrierroute/carrierroute.so"
+loadmodule "carrierroute"
 loadmodule "pv"
 loadmodule "mi_fifo"
 

test/unit/19.cfg

@@ -10,10 +10,10 @@ dns=no
 rev_dns=no
 
 #-----------------------Loading Modules-------------------------------------
-mpath="../../modules_k/"
-loadmodule "../../modules/tm/tm.so"
-loadmodule "../../modules/db_mysql/db_mysql.so"
-loadmodule "usrloc/usrloc.so"
+loadpath "../../modules/:../../modules_k/"
+loadmodule "tm"
+loadmodule "db_mysql"
+loadmodule "usrloc"
 loadmodule "registrar/registrar.so"
 loadmodule "sl/sl.so"
 loadmodule "maxfwd/maxfwd.so"

test/unit/2.cfg

@@ -1,5 +1,5 @@
 debug=2
-loadpath "../../modules_k"
+loadpath "../../modules/:../../modules_k/"
 loadmodule "../../modules/tm/tm.so"
 loadmodule "tmx"
 loadmodule "acc"

test/unit/20.cfg

@@ -10,11 +10,11 @@ dns=yes
 rev_dns=no
 
 #-----------------------Loading Modiules-------------------------------------
-mpath="../../modules_k/"
-loadmodule "../../modules/tm/tm.so"
-loadmodule "../../modules/db_mysql/db_mysql.so"
+loadpath "../../modules_k/:../../modules/"
+loadmodule "tm"
+loadmodule "db_mysql"
 loadmodule "usrloc/usrloc.so"
-loadmodule "registrar/registrar.so"
+loadmodule "registrar"
 loadmodule "sl/sl.so"
 loadmodule "maxfwd/maxfwd.so"
 loadmodule "acc/acc.so"

test/unit/21.cfg

@@ -22,10 +22,10 @@ rev_dns=no
 # ------------------ module loading ----------------------------------
 
 #set module path
-mpath="../../modules_k/"
+loadpath "../../modules_k/:../../modules/"
 
 # Uncomment this if you want to use SQL database
-loadmodule "../../modules/db_mysql/db_mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 
 loadmodule "sl/sl.so"
 loadmodule "rr/rr.so"

test/unit/25.cfg

@@ -2,13 +2,13 @@ debug=0
 listen=127.0.0.1
 port=5059
 
-mpath="../../modules_k/"
-loadmodule "../../modules/tm/tm.so"
+loadpath "../../modules_k/:../../modules/"
+loadmodule "tm/tm.so"
 loadmodule "sl/sl.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"
 loadmodule "xlog/xlog.so"
-loadmodule "../../modules/db_mysql/db_mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "pv/pv.so"
 loadmodule "userblacklist/userblacklist.so"
 loadmodule "maxfwd/maxfwd.so"

test/unit/26.cfg

@@ -1,15 +1,15 @@
 debug=3
 memdbg=6
 memlog=6
-loadpath "../../modules_k"
+loadpath "../../modules/:../../modules_k/"
 loadmodule "sl"
-loadmodule "../../modules/tm/tm.so"
+loadmodule "tm"
 loadmodule "tmx"
 loadmodule "xlog"
 loadmodule "maxfwd"
 loadmodule "pv"
 loadmodule "kex"
-loadmodule "../../modules/carrierroute/carrierroute.so"
+loadmodule "carrierroute"
 loadmodule "mi_fifo"
 
 modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")

test/unit/28.cfg

@@ -1,9 +1,9 @@
 debug=3
 
-mpath="../../modules_k/"
+loadpath "../../modules_k/:../../modules/"
 loadmodule "sl.so"
-loadmodule "../../modules/tm/tm.so"
-loadmodule "../../modules/db_mysql/db_mysql.so"
+loadmodule "tm/tm.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "cpl-c/cpl-c.so"
 loadmodule "mi_fifo/mi_fifo.so"
 loadmodule "textops/textops.so"

test/unit/30.cfg

@@ -1,5 +1,5 @@
 debug=2
-loadpath "../../modules_k"
+loadpath "../../modules/:../../modules_k/"
 loadmodule "sl"
 loadmodule "../../modules/tm/tm.so"
 loadmodule "xlog"

test/unit/33.cfg

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

test/unit/34.cfg

@@ -1,5 +1,5 @@
-mpath="../../modules_k"
-loadmodule "../../modules/tm/tm.so"
+loadpath "../../modules_k:../../modules"
+loadmodule "tm/tm.so"
 loadmodule "sl.so"
 loadmodule "usrloc.so"
 loadmodule "presence.so"

test/unit/40.cfg

@@ -1,9 +1,9 @@
 
-mpath="../../modules_k"
+loadpath "../../modules_k:../../modules/"
 
-loadmodule "../../modules/tm/tm.so"
+loadmodule "tm/tm.so"
 loadmodule "sl/sl.so"
-loadmodule "../../modules/db_mysql/db_mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"
 loadmodule "pike/pike.so"

test/unit/41.cfg

@@ -1,15 +1,15 @@
 #memlog=1
 debug=1
 children=1
-mpath="../../modules_k"
+loadpath "../../modules_k:../../modules/"
 
-loadmodule "../../modules/tm/tm.so"
+loadmodule "tm/tm.so"
 loadmodule "sl/sl.so"
-loadmodule "../../modules/db_mysql/db_mysql.so"
+loadmodule "db_mysql/db_mysql.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"
 loadmodule "pv/pv.so"
-loadmodule "../../modules/avpops/avpops.so"
+loadmodule "avpops/avpops.so"
 loadmodule "mi_fifo/mi_fifo.so"
 loadmodule "xlog/xlog.so"