Quellcode durchsuchen

tmodxx0001: run variants to cover modules that have load conflicts

Daniel-Constantin Mierla vor 7 Jahren
Ursprung
Commit
90799c01e2
3 geänderte Dateien mit 33 neuen und 8 gelöschten Zeilen
  1. 5 2
      units/tmodxx0001/README.md
  2. 14 3
      units/tmodxx0001/kamailio-allmods.cfg
  3. 14 3
      units/tmodxx0001/tmodxx0001.sh

+ 5 - 2
units/tmodxx0001/README.md

@@ -2,8 +2,11 @@
 
 Summary: load all modules - detect undefined symbols
 
-All modules that compile on the guest OS and don't have init constraints are loaded, the rest are commented, see `kamailio-allmods.cfg`.
+All modules that compile on the guest OS and don't have init constraints are loaded,
+the rest are commented, see `kamailio-allmods.cfg`. Some modules have load conflicts
+because they define same variables (e.g., $rtpstat is defined by rtpengine and rtpproxy).
 
 Following tests are done:
 
-  * run kamailio -f kamailio-allmods.cfg
+  * run `kamailio -f kamailio-allmods.cfg`
+  * run `kamailio -f kamailio-allmods.cfg -A WITH_IMS -A WITH_RTPPROXY`

+ 14 - 3
units/tmodxx0001/kamailio-allmods.cfg

@@ -56,7 +56,9 @@ loadmodule "db_sqlite.so"
 loadmodule "db_text.so"
 loadmodule "db_unixodbc.so"
 loadmodule "debugger.so"
+#!ifndef WITH_IMS
 loadmodule "dialog.so"
+#!endif
 loadmodule "dialplan.so"
 loadmodule "dispatcher.so"
 loadmodule "diversion.so"
@@ -82,14 +84,18 @@ loadmodule "http_client.so"
 loadmodule "imc.so"
 loadmodule "ims_auth.so"
 loadmodule "ims_charging.so"
-#loadmodule "ims_dialog.so"
+#!ifdef WITH_IMS
+loadmodule "ims_dialog.so"
+#!endif
 loadmodule "ims_diameter_server.so"
 loadmodule "ims_icscf.so"
 loadmodule "ims_isc.so"
 loadmodule "ims_ocs.so"
 loadmodule "ims_qos.so"
 loadmodule "ims_registrar_pcscf.so"
-#loadmodule "ims_registrar_scscf.so"
+#!ifdef WITH_IMS
+loadmodule "ims_registrar_scscf.so"
+#!endif
 loadmodule "ims_usrloc_pcscf.so"
 loadmodule "ims_usrloc_scscf.so"
 loadmodule "ipops.so"
@@ -156,13 +162,18 @@ loadmodule "qos.so"
 loadmodule "rabbitmq.so"
 loadmodule "ratelimit.so"
 loadmodule "regex.so"
+#!ifndef WITH_IMS
 loadmodule "registrar.so"
+#!endif
 loadmodule "rls.so"
 loadmodule "rr.so"
 loadmodule "rtimer.so"
 loadmodule "rtjson.so"
+#!ifndef WITH_RTPPROXY
 loadmodule "rtpengine.so"
-#loadmodule "rtpproxy.so"
+#!else
+loadmodule "rtpproxy.so"
+#!endif
 loadmodule "sanity.so"
 loadmodule "sca.so"
 loadmodule "sctp.so"

+ 14 - 3
units/tmodxx0001/tmodxx0001.sh

@@ -7,9 +7,20 @@ echo "--- start kamailio -f ./kamailio-allmods.cfg"
 ${KAMBIN} -f ./kamailio-allmods.cfg -dd -E 2>&1 | tee /tmp/kamailio-allmods.log
 echo
 echo "--- grep output"
+echo
+grep "undefined symbol" /tmp/kamailio-allmods.log
+ret=$?
+if [ ! "$ret" -eq 1 ] ; then
+    exit 1
+fi
+echo "--- start kamailio -f ./kamailio-allmods.cfg -A WITH_IMS -A WITH_RTPPROXY"
+${KAMBIN} -f ./kamailio-allmods.cfg -dd -E  -A WITH_IMS -A WITH_RTPPROXY 2>&1 | tee /tmp/kamailio-allmods.log
+echo
+echo "--- grep output"
+echo
 grep "undefined symbol" /tmp/kamailio-allmods.log
 ret=$?
-if [ "$ret" -eq 1 ] ; then
-    exit 0
+if [ ! "$ret" -eq 1 ] ; then
+    exit 1
 fi
-exit 1
+exit 0