- dbtext and db_berkeley must be loaded before modules that want to use them

git-svn-id: https://openser.svn.sourceforge.net/svnroot/openser/trunk@3206 689a6050-402a-0410-94f2-e92a70836424

test/unit/15.sh

@@ -1,19 +1,18 @@
 #!/bin/bash
 # load all modules without external dependencies with dbtext
 
-CFG=2.cfg
-cp $CFG $CFG.bak
+CFG=15.cfg
 
-echo "loadmodule \"dbtext/dbtext.so\"" >> $CFG
+echo "loadmodule \"../modules/dbtext/dbtext.so\"" >> $CFG
+cat 2.cfg >> $CFG
 echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"dbtext://`pwd`/../scripts/dbtext/openser\")" >> $CFG
-# start
+
 ../openser -f $CFG > /dev/null
 ret=$?
 
 sleep 1
 killall -9 openser
 
-mv $CFG.bak $CFG
-rm -f dispatcher.list
+rm $CFG
 
 exit $ret

test/unit/17.sh

@@ -6,19 +6,18 @@ if [ ! -e ../modules/db_berkeley/db_berkeley.so ] ; then
 	exit 0
 fi ;
 
-CFG=2.cfg
-cp $CFG $CFG.bak
+CFG=17.cfg
 
-echo "loadmodule \"db_berkeley/db_berkeley.so\"" >> $CFG
+echo "loadmodule \"../modules/db_berkeley/db_berkeley.so\"" >> $CFG
+cat 2.cfg >> $CFG
 echo "modparam(\"acc|alias_db|auth_db|dialog|dispatcher|domain|domainpolicy|group|imc|lcr|msilo|siptrace|speeddial|uri_db|usrloc|permissions|pdt\", \"db_url\", \"db_berkeley://`pwd`/../scripts/db_berkeley/openser\")" >> $CFG
-# start
+
 ../openser -f $CFG > /dev/null
 ret=$?
 
 sleep 1
 killall -9 openser
 
-mv $CFG.bak $CFG
-rm -f dispatcher.list
+rm $CFG
 
 exit $ret