[sr-dev] git:master: test/unit: Cleaned up cfg for unit tests
Marius Zbihlei
marius.zbihlei at 1and1.ro
Fri Aug 13 10:27:08 CEST 2010
Module: sip-router
Branch: master
Commit: 2f6491383eb4d9a93e61516a42cc3f2f123e9ede
URL: http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=2f6491383eb4d9a93e61516a42cc3f2f123e9ede
Author: Marius Zbihlei <marius.zbihlei at 1and1.ro>
Committer: Marius Zbihlei <marius.zbihlei at 1and1.ro>
Date: Fri Aug 13 11:21:51 2010 +0300
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 | 2 +-
test/unit/13.cfg | 6 +++---
test/unit/14.cfg | 4 ++--
test/unit/19.cfg | 8 ++++----
test/unit/2.cfg | 2 +-
test/unit/20.cfg | 8 ++++----
test/unit/21.cfg | 4 ++--
test/unit/25.cfg | 6 +++---
test/unit/26.cfg | 6 +++---
test/unit/28.cfg | 6 +++---
test/unit/30.cfg | 2 +-
test/unit/33.cfg | 2 +-
test/unit/34.cfg | 4 ++--
test/unit/40.cfg | 6 +++---
test/unit/41.cfg | 8 ++++----
15 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/test/unit/12.cfg b/test/unit/12.cfg
index 1fcc96d..2738ad5 100644
--- a/test/unit/12.cfg
+++ b/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"
diff --git a/test/unit/13.cfg b/test/unit/13.cfg
index dc8394d..bcc49df 100644
--- a/test/unit/13.cfg
+++ b/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"
diff --git a/test/unit/14.cfg b/test/unit/14.cfg
index dde83a0..f99e4b8 100644
--- a/test/unit/14.cfg
+++ b/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"
diff --git a/test/unit/19.cfg b/test/unit/19.cfg
index 6f3ad8b..f66e591 100644
--- a/test/unit/19.cfg
+++ b/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"
diff --git a/test/unit/2.cfg b/test/unit/2.cfg
index ebddb44..113754a 100644
--- a/test/unit/2.cfg
+++ b/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"
diff --git a/test/unit/20.cfg b/test/unit/20.cfg
index 7405967..be5a9b0 100644
--- a/test/unit/20.cfg
+++ b/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"
diff --git a/test/unit/21.cfg b/test/unit/21.cfg
index 9eba1d9..ce943c6 100644
--- a/test/unit/21.cfg
+++ b/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"
diff --git a/test/unit/25.cfg b/test/unit/25.cfg
index 6c68a43..636910e 100644
--- a/test/unit/25.cfg
+++ b/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"
diff --git a/test/unit/26.cfg b/test/unit/26.cfg
index 0953b60..52d8da9 100644
--- a/test/unit/26.cfg
+++ b/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")
diff --git a/test/unit/28.cfg b/test/unit/28.cfg
index 1325705..531446e 100644
--- a/test/unit/28.cfg
+++ b/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"
diff --git a/test/unit/30.cfg b/test/unit/30.cfg
index 7215b8e..c2f006b 100644
--- a/test/unit/30.cfg
+++ b/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"
diff --git a/test/unit/33.cfg b/test/unit/33.cfg
index c498a66..671aba3 100644
--- a/test/unit/33.cfg
+++ b/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"
diff --git a/test/unit/34.cfg b/test/unit/34.cfg
index eff5e72..6f158a5 100644
--- a/test/unit/34.cfg
+++ b/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"
diff --git a/test/unit/40.cfg b/test/unit/40.cfg
index f9f5c6c..994629a 100644
--- a/test/unit/40.cfg
+++ b/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"
diff --git a/test/unit/41.cfg b/test/unit/41.cfg
index 0ca4422..d8f865f 100644
--- a/test/unit/41.cfg
+++ b/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"
More information about the sr-dev
mailing list