[sr-dev] git:master: tests: fix module paths

[Henning Westerholt]

Module: sip-router
Branch: master
Commit: 731f1b2a72a04901b11e34de91bc1c276e47fce1
URL:    http://git.sip-router.org/cgi-bin/gitweb.cgi/sip-router/?a=commit;h=731f1b2a72a04901b11e34de91bc1c276e47fce1

Author: Henning Westerholt <hw at kamailio.org>
Committer: Henning Westerholt <hw at kamailio.org>
Date:   Sun Apr 21 19:25:51 2013 +0200

tests: fix module paths

---

 test/unit/15.sh  |    2 +-
 test/unit/39.sh  |    2 +-
 test/unit/4.sh   |    4 ++--
 test/unit/43.sh  |    2 +-
 test/unit/44.sh  |    2 +-
 test/unit/45.cfg |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/test/unit/15.sh b/test/unit/15.sh
index 14b0e08..820fc8b 100755
--- a/test/unit/15.sh
+++ b/test/unit/15.sh
@@ -28,7 +28,7 @@ if ! (check_kamailio); then
 	exit 0
 fi ;
 
-echo "loadmodule \"../../modules_k/db_text/db_text.so\"" >> $CFG
+echo "loadmodule \"../../modules/db_text/db_text.so\"" >> $CFG
 cat 2.cfg >> $CFG
 echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../utils/kamctl/dbtext/kamailio\")" >> $CFG
 
diff --git a/test/unit/39.sh b/test/unit/39.sh
index 91e4b1a..5b4d906 100755
--- a/test/unit/39.sh
+++ b/test/unit/39.sh
@@ -36,7 +36,7 @@ NR=25
 
 cp $CFG $CFG.bak
 
-echo "loadmodule \"$SR_DIR/modules_k/db_unixodbc/db_unixodbc.so\"" >> $CFG
+echo "loadmodule \"$SR_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG
 echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 echo "modparam(\"usrloc\", \"fetch_rows\", 13)" >> $CFG
 
diff --git a/test/unit/4.sh b/test/unit/4.sh
index 4df2223..4901115 100755
--- a/test/unit/4.sh
+++ b/test/unit/4.sh
@@ -29,8 +29,8 @@ if ! (check_kamailio); then
 fi ;
 
 # setup config
-echo -e "loadmodule \"$SR_DIR/modules_k/mi_fifo/mi_fifo.so\"" > $CFG
-echo -e "loadmodule \"$SR_DIR/modules_k/kex/kex.so\"" >> $CFG
+echo -e "loadmodule \"$SR_DIR/modules/mi_fifo/mi_fifo.so\"" > $CFG
+echo -e "loadmodule \"$SR_DIR/modules/kex/kex.so\"" >> $CFG
 echo -e "modparam(\"mi_fifo\", \"fifo_name\", \"/tmp/kamailio_fifo\")" >> $CFG
 
 
diff --git a/test/unit/43.sh b/test/unit/43.sh
index 795941c..db5efbe 100755
--- a/test/unit/43.sh
+++ b/test/unit/43.sh
@@ -30,7 +30,7 @@ fi ;
 CFG=43.cfg
 TMPFILE=`mktemp -t kamailio-test.XXXXXXXXX`
 # setup config
-echo "mpath=\"../../modules_k\"" > $CFG
+echo "mpath=\"../../modules\"" > $CFG
 echo "loadmodule \"../../modules/tm/tm.so\"" >> $CFG
 echo "loadmodule \"sl/sl.so\"" >> $CFG
 echo "loadmodule \"mi_fifo/mi_fifo.so\"" >> $CFG
diff --git a/test/unit/44.sh b/test/unit/44.sh
index 722e66a..c8f0215 100755
--- a/test/unit/44.sh
+++ b/test/unit/44.sh
@@ -30,7 +30,7 @@ fi ;
 CFG=11.cfg
 
 cp $CFG $CFG.tmp
-echo "loadmodule \"$SR_DIR/modules_k/db_unixodbc/db_unixodbc.so\"" >> $CFG
+echo "loadmodule \"$SR_DIR/modules/db_unixodbc/db_unixodbc.so\"" >> $CFG
 echo "modparam(\"usrloc\", \"db_url\", \"unixodbc://kamailio:kamailiorw@localhost/kamailio\")" >> $CFG
 
 $BIN -w . -f $CFG > /dev/null
diff --git a/test/unit/45.cfg b/test/unit/45.cfg
index b289681..a77b564 100644
--- a/test/unit/45.cfg
+++ b/test/unit/45.cfg
@@ -10,7 +10,7 @@ dns=no
 rev_dns=no
 
 #-----------------------Loading Modules-------------------------------------
-mpath="../../modules_k/"
+mpath="../../modules/"
 loadmodule "../../modules/db_mysql/db_mysql.so"
 loadmodule "usrloc/usrloc.so"
 loadmodule "registrar/registrar.so"