Browse Source

tests: fix module paths

Henning Westerholt 12 years ago
parent
commit
731f1b2a72
6 changed files with 7 additions and 7 deletions
  1. 1 1
      test/unit/15.sh
  2. 1 1
      test/unit/39.sh
  3. 2 2
      test/unit/4.sh
  4. 1 1
      test/unit/43.sh
  5. 1 1
      test/unit/44.sh
  6. 1 1
      test/unit/45.cfg

+ 1 - 1
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
 

+ 1 - 1
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
 

+ 2 - 2
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
 
 

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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"