[SR-Dev] git:master: test: port dbtext default modules load and cr on postgres

Henning Westerholt henning.westerholt at 1und1.de
Mon May 18 15:43:32 CEST 2009


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

Author: Henning Westerholt <henning.westerholt at 1und1.de>
Committer: Henning Westerholt <henning.westerholt at 1und1.de>
Date:   Thu May 14 16:51:40 2009 +0200

test: port dbtext default modules load and cr on postgres

---

 test/unit/15.sh |    6 +++---
 test/unit/23.sh |   10 +++-------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/test/unit/15.sh b/test/unit/15.sh
index bb5e8c0..3938e98 100755
--- a/test/unit/15.sh
+++ b/test/unit/15.sh
@@ -28,11 +28,11 @@ if ! (check_kamailio); then
 	exit 0
 fi ;
 
-echo "loadmodule \"../modules/db_text/db_text.so\"" >> $CFG
+echo "loadmodule \"../../modules_k/db_text/db_text.so\"" >> $CFG
 cat 2.cfg >> $CFG
-echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../scripts/dbtext/kamailio\")" >> $CFG
+echo "modparam(\"$DB_ALL_MOD\", \"db_url\", \"text://`pwd`/../../scripts/dbtext/kamailio\")" >> $CFG
 
-../$BIN -w . -f $CFG > /dev/null
+$BIN -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
diff --git a/test/unit/23.sh b/test/unit/23.sh
index e19a719..9bddb9a 100755
--- a/test/unit/23.sh
+++ b/test/unit/23.sh
@@ -32,7 +32,7 @@ CFG=13.cfg
 cp $CFG $CFG.bak
 
 # setup config
-echo "loadmodule \"db_postgres/db_postgres.so\"" >> $CFG
+echo "loadmodule \"../../modules/db_postgres/db_postgres.so\"" >> $CFG
 echo "modparam(\"carrierroute\", \"config_source\", \"db\")" >> $CFG
 echo "modparam(\"carrierroute\", \"db_url\", \"postgres://openserro:openserro@localhost/openser\")" >> $CFG
 
@@ -51,17 +51,15 @@ 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 -w . -f $CFG > /dev/null
 ret=$?
 
 sleep 1
 
-cd ../scripts
-
 TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 if [ "$ret" -eq 0 ] ; then
-	./$CTL fifo cr_dump_routes > $TMPFILE
+	$CTL fifo cr_dump_routes > $TMPFILE
 	ret=$?
 fi ;
 
@@ -100,8 +98,6 @@ delete from carrierroute where carrier=1;
 delete from carrierroute where carrier=2;
 delete from carrierroute where carrier=3;"
 
-cd ../test
-
 mv $CFG.bak $CFG
 rm $TMPFILE
 




More information about the sr-dev mailing list