optional_api: Remove unused nonoptreq fields

As they're not actively used, they only grow stale. The moduleinfo field itself
is kept in Asterisk 13/15 for ABI compatibility.

ASTERISK-28046 #close

Change-Id: I8df66a7007f807840414bb348511a8c14c05a9fc

diff --git a/apps/app_adsiprog.c b/apps/app_adsiprog.c
index 2dd226fbdeeccac52883437706998197fc2ecc1f..116b6f80d8accc8b8a99b3132377982004620c7c 100644 (file)
--- a/apps/app_adsiprog.c
+++ b/apps/app_adsiprog.c
@@ -1613,5 +1613,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Asterisk ADSI Programmin
        .support_level = AST_MODULE_SUPPORT_EXTENDED,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_adsi",
 );

diff --git a/apps/app_getcpeid.c b/apps/app_getcpeid.c
index e0b9f12393c433c02283ac759e55dd2770ad5840..7c15f8ec19e5dfa36e4805575f857a3221c06bd8 100644 (file)
--- a/apps/app_getcpeid.c
+++ b/apps/app_getcpeid.c
@@ -140,5 +140,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Get ADSI CPE ID",
        .support_level = AST_MODULE_SUPPORT_EXTENDED,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_adsi",
 );

diff --git a/apps/app_queue.c b/apps/app_queue.c
index 32a979e76f3a967a490e41574284e77ea2a1cf04..0c295a35b450924080a92f1d295cf289476da4b1 100644 (file)
--- a/apps/app_queue.c
+++ b/apps/app_queue.c
@@ -11291,5 +11291,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "True Call Queueing",
        .unload = unload_module,
        .reload = reload,
        .load_pri = AST_MODPRI_DEVSTATE_CONSUMER,
-       .nonoptreq = "res_monitor",
 );

diff --git a/apps/app_speech_utils.c b/apps/app_speech_utils.c
index 339c3161f667c37d88409f2839f485cf3b88eb13..e445705b1e86ad5224c820f23ee9327d948d5b3b 100644 (file)
--- a/apps/app_speech_utils.c
+++ b/apps/app_speech_utils.c
@@ -1003,5 +1003,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Dialplan Speech Applicat
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_speech",
 );

diff --git a/apps/app_stack.c b/apps/app_stack.c
index 459c06df245d19e5c8abd2a639991f12d3335831..a4c5b04f33672c81abdd9a341c9e17f903f5b9dd 100644 (file)
--- a/apps/app_stack.c
+++ b/apps/app_stack.c
@@ -1320,5 +1320,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT | AST_MODFLAG_LOAD_ORDER,
        .load = load_module,
        .unload = unload_module,
        .load_pri = AST_MODPRI_APP_DEPEND,
-       .nonoptreq = "res_agi",
 );

diff --git a/apps/app_stasis.c b/apps/app_stasis.c
index 81c58e8b0cbc5a147d160b94568727fb07f9b7f5..4d618106cbe1631f83b368df6cfffbaac9d13b9e 100644 (file)
--- a/apps/app_stasis.c
+++ b/apps/app_stasis.c
@@ -144,5 +144,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis dialplan applicat
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis",
 );

diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index 2be3ae4d0acda35be74d35a7409dea4ee5593da9..2b217e18c51fa400c2da6d906c875c219f625ca2 100644 (file)
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -16428,5 +16428,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, tdesc,
        .load = load_module,
        .unload = unload_module,
        .reload = reload,
-       .nonoptreq = "res_adsi,res_smdi",
 );

diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c
index 77c69061126f35e902eb86b30764ec00c43215e2..05f20ad4460f12cb820bd533d89637cf2cc5bc64 100644 (file)
--- a/channels/chan_dahdi.c
+++ b/channels/chan_dahdi.c
@@ -19546,5 +19546,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, tdesc,
        .unload = unload_module,
        .reload = reload,
        .load_pri = AST_MODPRI_CHANNEL_DRIVER,
-       .nonoptreq = "res_smdi",
 );

diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c
index 5078b78baa290c17fb300c439d776ac14eadd2ff..5a230b60aa881ecc01db1d6b4a915e3c83e8d6e6 100644 (file)
--- a/channels/chan_iax2.c
+++ b/channels/chan_iax2.c
@@ -14909,5 +14909,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Inter Asterisk eXchan
        .unload = unload_module,
        .reload = reload,
        .load_pri = AST_MODPRI_CHANNEL_DRIVER,
-       .nonoptreq = "res_crypto",
 );

diff --git a/channels/chan_mgcp.c b/channels/chan_mgcp.c
index 547226c80edbd5df9fbeb7784294dfe228ee25bc..62bb82dc574bf20160ec8116b54f0731f58a0bad 100644 (file)
--- a/channels/chan_mgcp.c
+++ b/channels/chan_mgcp.c
@@ -5025,5 +5025,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Media Gateway Control
        .unload = unload_module,
        .reload = reload,
        .load_pri = AST_MODPRI_CHANNEL_DRIVER,
-       .nonoptreq = "res_pktccops",
 );

diff --git a/channels/chan_sip.c b/channels/chan_sip.c
index 34b361c65d17f94323b0be090916dad8e51c9539..5417658de2cc76792a01cf33882cd6f3645d8810 100644 (file)
--- a/channels/chan_sip.c
+++ b/channels/chan_sip.c
@@ -35607,5 +35607,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_LOAD_ORDER, "Session Initiation Pr
        .unload = unload_module,
        .reload = reload,
        .load_pri = AST_MODPRI_CHANNEL_DRIVER,
-       .nonoptreq = "res_crypto,res_http_websocket",
 );

diff --git a/funcs/func_aes.c b/funcs/func_aes.c
index 2eefb056b10c436a36e60f3854dc85b91639e50d..2962fe71ad861a05eed3e3f0040ee8e9265a0b85 100644 (file)
--- a/funcs/func_aes.c
+++ b/funcs/func_aes.c
@@ -181,5 +181,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "AES dialplan functions",
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_crypto",
 );

diff --git a/include/asterisk/module.h b/include/asterisk/module.h
index bcdb3830f577ffdce25d4cc8debee5c0c7e8347c..d19cb1ffdf5d937984b585412bd552acf32b91ca 100644 (file)
--- a/include/asterisk/module.h
+++ b/include/asterisk/module.h
@@ -338,9 +338,8 @@ struct ast_module_info {
         *  on load. */
        unsigned char load_pri;
 
-       /*! Modules which should be loaded first, in comma-separated string format.
-        * These are only required for loading, when the optional_api header file
-        * detects that the compiler does not support the optional API featureset. */
+       /*! Obsolete! This is not used since the optional_api portability rework.
+        * This field does nothing and will be removed in future version of Asterisk. */
        const char *nonoptreq;
        /*! The support level for the given module */
        enum ast_module_support_level support_level;

diff --git a/pbx/pbx_dundi.c b/pbx/pbx_dundi.c
index d983795ce628191637c16e08dbbbe446155017ee..6b32a31a1521575a08cf753e6ceb823b88da143a 100644 (file)
--- a/pbx/pbx_dundi.c
+++ b/pbx/pbx_dundi.c
@@ -5101,5 +5101,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Distributed Universal Nu
        .load = load_module,
        .unload = unload_module,
        .reload = reload,
-       .nonoptreq = "res_crypto",
 );

diff --git a/res/res_ari.c b/res/res_ari.c
index 8a01809494a3afa0fd094260628d16dd8340a4a6..c4b7054b44b587a27cd2fb210f8ae63bee5ee707 100644 (file)
--- a/res/res_ari.c
+++ b/res/res_ari.c
@@ -1197,6 +1197,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
        .load = load_module,
        .unload = unload_module,
        .reload = reload_module,
-       .nonoptreq = "res_http_websocket",
        .load_pri = AST_MODPRI_APP_DEPEND,
 );

diff --git a/res/res_ari_applications.c b/res/res_ari_applications.c
index cf700c464e0cb4b0d21fc608fce8ff33333ef1ea..c3d46c9cc27c2f4561d49bd08b87c0e31370c7a8 100644 (file)
--- a/res/res_ari_applications.c
+++ b/res/res_ari_applications.c
@@ -518,5 +518,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sta
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_asterisk.c b/res/res_ari_asterisk.c
index eb0617b4c7081464219cd9e4d271317ede83dad7..1d0085e8400a5ea4dbfc76fcee7aae057e0fb963 100644 (file)
--- a/res/res_ari_asterisk.c
+++ b/res/res_ari_asterisk.c
@@ -1239,5 +1239,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Ast
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_bridges.c b/res/res_ari_bridges.c
index 65bf7ed3e73c8276cb9e238b6e658f1323f97bb0..b761bed7ae00f88eaed0439510ef82163d06058d 100644 (file)
--- a/res/res_ari_bridges.c
+++ b/res/res_ari_bridges.c
@@ -1565,5 +1565,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Bri
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_channels.c b/res/res_ari_channels.c
index f6befcc90d4a036bdd643586684db4ceae6cd825..1edd0857f5fa61fadf07bc7793a4838ea67b8945 100644 (file)
--- a/res/res_ari_channels.c
+++ b/res/res_ari_channels.c
@@ -2869,5 +2869,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Cha
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_device_states.c b/res/res_ari_device_states.c
index f393935626581035a6fc39268eeb840d92f2ab69..5af09599ae74d3145f57f944dd15f6d0b856fb27 100644 (file)
--- a/res/res_ari_device_states.c
+++ b/res/res_ari_device_states.c
@@ -349,5 +349,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Dev
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_endpoints.c b/res/res_ari_endpoints.c
index d1242c0fbc0e05e0d68d2fe6bc4d6bdd88ecb15e..4b856f0d83538782f0185600f53332a2033d14e8 100644 (file)
--- a/res/res_ari_endpoints.c
+++ b/res/res_ari_endpoints.c
@@ -473,5 +473,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - End
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_events.c b/res/res_ari_events.c
index f916d0e4eedba8c8c3bc4305ff9c473fa94869fb..c142b4e46502ccebec6b2af43d28d3e3f9711218 100644 (file)
--- a/res/res_ari_events.c
+++ b/res/res_ari_events.c
@@ -473,5 +473,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Web
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_mailboxes.c b/res/res_ari_mailboxes.c
index 1f6d2cc81b97a838ff62e43b4b7091cfb2741e69..0230570738ce0c2e14a7882f6e4c2d59dd0cea3f 100644 (file)
--- a/res/res_ari_mailboxes.c
+++ b/res/res_ari_mailboxes.c
@@ -355,5 +355,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Mai
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_playbacks.c b/res/res_ari_playbacks.c
index 40099cfb4882253aaff8f12635acb3ae837a35bd..59995ec5841e31af299e62c617a3d56aa58ddc13 100644 (file)
--- a/res/res_ari_playbacks.c
+++ b/res/res_ari_playbacks.c
@@ -307,5 +307,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Pla
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_recordings.c b/res/res_ari_recordings.c
index fe3d343ee2acac875ae87ff92bca2b6bdcf0c6c4..75d999f2261945d32040e74a9ed99f9f3a462bfe 100644 (file)
--- a/res/res_ari_recordings.c
+++ b/res/res_ari_recordings.c
@@ -891,5 +891,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Rec
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_ari_sounds.c b/res/res_ari_sounds.c
index 8d5928a504b6e4772bf98a9af3f83b2105f850da..7b167796d4978c7a1b5635359ce9d1a9c3e4d753 100644 (file)
--- a/res/res_ari_sounds.c
+++ b/res/res_ari_sounds.c
@@ -237,5 +237,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - Sou
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );

diff --git a/res/res_chan_stats.c b/res/res_chan_stats.c
index 061d0867eb3f85eba49766acac49fe27ee682228..c396120dcd7f619daac48a7842d2615c560afc6e 100644 (file)
--- a/res/res_chan_stats.c
+++ b/res/res_chan_stats.c
@@ -182,5 +182,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Example of how to use St
        .support_level = AST_MODULE_SUPPORT_EXTENDED,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_statsd"
 );

diff --git a/res/res_endpoint_stats.c b/res/res_endpoint_stats.c
index 1e3f104c2120c28b611d0edb046ff36c978713f3..a9ccee558619f23e19660f891eb37b07ebd4fc5c 100644 (file)
--- a/res/res_endpoint_stats.c
+++ b/res/res_endpoint_stats.c
@@ -151,5 +151,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint statistics",
        .support_level = AST_MODULE_SUPPORT_EXTENDED,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_statsd"
        );

diff --git a/res/res_stasis_answer.c b/res/res_stasis_answer.c
index 407a6313546f3d44ebe1d39e78b8fe79e197b013..c34bc830cd6375a23dc38e1b4e5d27035a8a50fa 100644 (file)
--- a/res/res_stasis_answer.c
+++ b/res/res_stasis_answer.c
@@ -73,5 +73,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis"
 );

diff --git a/res/res_stasis_device_state.c b/res/res_stasis_device_state.c
index 6527af4a61d2f1016b058618c36db624be42c3ac..20c4b5c61e030ff4caaf8c5fb5a8496854cfd7b8 100644 (file)
--- a/res/res_stasis_device_state.c
+++ b/res/res_stasis_device_state.c
@@ -482,5 +482,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis"
 );

diff --git a/res/res_stasis_mailbox.c b/res/res_stasis_mailbox.c
index 5ed061de2e375f18ea197a60696cd7825cd43439..eaf2e6017978814efc5585e321b93b29e531c183 100644 (file)
--- a/res/res_stasis_mailbox.c
+++ b/res/res_stasis_mailbox.c
@@ -161,5 +161,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis,res_mwi_external"
 );

diff --git a/res/res_stasis_playback.c b/res/res_stasis_playback.c
index ca0446b89eb398a871b35d7bdd34567111f40a4f..de6f5917902034c424ac108dd4d3fb6389c217bc 100644 (file)
--- a/res/res_stasis_playback.c
+++ b/res/res_stasis_playback.c
@@ -759,5 +759,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis,res_stasis_recording"
 );

diff --git a/res/res_stasis_recording.c b/res/res_stasis_recording.c
index 56984cb4016c5c72465f85c33e2e87d63d6881ec..369ae393000b0a62b9615b1e08bb3d483842a6d3 100644 (file)
--- a/res/res_stasis_recording.c
+++ b/res/res_stasis_recording.c
@@ -655,6 +655,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS | AST_MODFLAG_LOAD_
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis",
-       .load_pri = AST_MODPRI_APP_DEPEND
+       .load_pri = AST_MODPRI_APP_DEPEND,
 );

diff --git a/res/res_stasis_snoop.c b/res/res_stasis_snoop.c
index f797a9b942758b633002f2826469f87567293d86..00b9735de308ee25a1bc6a873eac5d629fde4675 100644 (file)
--- a/res/res_stasis_snoop.c
+++ b/res/res_stasis_snoop.c
@@ -445,5 +445,4 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_GLOBAL_SYMBOLS, "Stasis applicatio
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis"
 );

diff --git a/res/res_stasis_test.c b/res/res_stasis_test.c
index 19d2a42c6af25087a9fc73c29e22df4724992e07..86a98450e1ef7eadadee8a3876e557e02d011fd0 100644 (file)
--- a/res/res_stasis_test.c
+++ b/res/res_stasis_test.c
@@ -103,8 +103,7 @@ struct stasis_message_sink *stasis_message_sink_create(void)
  * it has to do with how we load modules.
  *
  * Modules have their own metadata compiled into them in the module info block
- * at the end of the file.  This includes dependency information in the
- * \c nonoptreq field.
+ * at the end of the file.
  *
  * Asterisk loads the module, inspects the field, then loads any needed
  * dependencies. This works because Asterisk passes \c RTLD_LAZY to the initial

diff --git a/rest-api-templates/res_ari_resource.c.mustache b/rest-api-templates/res_ari_resource.c.mustache
index c2ffd8eed139ccd2e399cf14f1f49de681b069fa..89f48c50f152c627fa306d46c00cb13fefc947ea 100644 (file)
--- a/rest-api-templates/res_ari_resource.c.mustache
+++ b/rest-api-templates/res_ari_resource.c.mustache
@@ -322,6 +322,5 @@ AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "RESTful API module - {{{
        .support_level = AST_MODULE_SUPPORT_CORE,
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari,res_stasis",
 );
 {{/api_declaration}}

diff --git a/tests/test_ari.c b/tests/test_ari.c
index bce5f95d64c9825c071617e666953fee93d0171f..66c299e0242784fae3ec6d816c5b46e76741b2fe 100644 (file)
--- a/tests/test_ari.c
+++ b/tests/test_ari.c
@@ -573,5 +573,4 @@ static int load_module(void)
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "ARI testing",
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_ari",
 );

diff --git a/tests/test_res_stasis.c b/tests/test_res_stasis.c
index cb79fa6fea7754d6181c66c36364791027a7dd19..7a417854d4988c2c5b1c6f1f4c716cf281651519 100644 (file)
--- a/tests/test_res_stasis.c
+++ b/tests/test_res_stasis.c
@@ -195,5 +195,4 @@ static int load_module(void)
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Stasis Core testing",
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis",
 );

diff --git a/tests/test_stasis_endpoints.c b/tests/test_stasis_endpoints.c
index 134738fee53e43f60c17551a1ecd3de1c1ed38b8..88f0cb49c06c15ea5be6599125ac59b87e75743c 100644 (file)
--- a/tests/test_stasis_endpoints.c
+++ b/tests/test_stasis_endpoints.c
@@ -306,5 +306,4 @@ static int load_module(void)
 AST_MODULE_INFO(ASTERISK_GPL_KEY, AST_MODFLAG_DEFAULT, "Endpoint stasis-related testing",
        .load = load_module,
        .unload = unload_module,
-       .nonoptreq = "res_stasis_test",
 );