[sr-dev] git:master: test/unit/28.sh Fixed CPL-C module test

[Marius Zbihlei]

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

Author: Marius Zbihlei <marius.zbihlei at 1and1.ro>
Committer: Marius Zbihlei <marius.zbihlei at 1and1.ro>
Date:   Mon Jan 18 14:38:19 2010 +0200

test/unit/28.sh Fixed CPL-C module test

---

 test/unit/28.cfg |   14 +++++++-------
 test/unit/28.sh  |   10 +++++-----
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/test/unit/28.cfg b/test/unit/28.cfg
index f062f15..1325705 100644
--- a/test/unit/28.cfg
+++ b/test/unit/28.cfg
@@ -1,15 +1,15 @@
 debug=3
 
-mpath="../modules"
+mpath="../../modules_k/"
 loadmodule "sl.so"
-loadmodule "tm.so"
-loadmodule "db_mysql.so"
-loadmodule "cpl-c.so"
-loadmodule "mi_fifo.so"
-loadmodule "textops.so"
+loadmodule "../../modules/tm/tm.so"
+loadmodule "../../modules/db_mysql/db_mysql.so"
+loadmodule "cpl-c/cpl-c.so"
+loadmodule "mi_fifo/mi_fifo.so"
+loadmodule "textops/textops.so"
 
 modparam("mi_fifo", "fifo_name", "/tmp/kamailio_fifo")
-modparam("cpl-c","cpl_dtd_file","../modules/cpl-c/cpl-06.dtd")
+modparam("cpl-c","cpl_dtd_file","../../modules_k/cpl-c/cpl-06.dtd")
 
 route {
   if (is_method("INVITE")) {
diff --git a/test/unit/28.sh b/test/unit/28.sh
index 0fe9653..d6cd07a 100755
--- a/test/unit/28.sh
+++ b/test/unit/28.sh
@@ -32,11 +32,11 @@ CPL=cpl_ignore.xml
 TMPFILE=`mktemp -t kamailio-test.XXXXXXXXXX`
 
 
-../$BIN -w . -f $CFG &> /dev/null;
+$BIN -w . -f $CFG &> /dev/null;
 ret=$?
 sleep 1
 
-../scripts/$CTL fifo LOAD_CPL sip:alice at 127.0.0.1 $CPL
+$CTL fifo LOAD_CPL sip:alice at 127.0.0.1 $CPL
 
 if [ "$ret" -eq 0 ] ; then
 	sipp -m 1 -f 1 127.0.0.1:5060 -sf cpl_test.xml &> /dev/null;
@@ -44,14 +44,14 @@ if [ "$ret" -eq 0 ] ; then
 fi;
 
 if [ "$ret" -eq 0 ] ; then
-  ../scripts/$CTL fifo GET_CPL sip:alice at 127.0.0.1 > $TMPFILE 
+  $CTL fifo GET_CPL sip:alice at 127.0.0.1 > $TMPFILE 
   diff $TMPFILE $CPL 
   ret=$?
 fi; 
 
 if [ "$ret" -eq 0 ] ; then
-  ../scripts/$CTL fifo REMOVE_CPL sip:alice at 127.0.0.1
-  ../scripts/$CTL fifo GET_CPL sip:alice at 127.0.0.1 > $TMPFILE
+  $CTL fifo REMOVE_CPL sip:alice at 127.0.0.1
+  $CTL fifo GET_CPL sip:alice at 127.0.0.1 > $TMPFILE
 fi;
 
 diff $TMPFILE $CPL &> /dev/null;