[Asterisk-code-review] test_utils.c: Skip test adsi_loaded_test if module not loaded. (...asterisk[certified/16.3])

[Christian Savinovich]

Christian Savinovich has uploaded this change for review. ( https://gerrit.asterisk.org/c/asterisk/+/12828


Change subject: test_utils.c: Skip test adsi_loaded_test if module not loaded.
......................................................................

test_utils.c: Skip test adsi_loaded_test if module not loaded.

Module res_adsi.so is deprecated, therefore it does not load by default.
Module not loaded causes it to yield a FAIL when tested by tests/test_utils.c.
This fix checks if the corresponding module is loaded at the start of the test,
and if not, it passes the test and exits with a message.

This fix is applied to all versions where the module is marked deprecated.

Change-Id: I52be64c8f6af222e15148a856d1f10cb113e1e94
---
M tests/CI/buildAsterisk.sh
M tests/test_utils.c
2 files changed, 5 insertions(+), 2 deletions(-)



  git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/28/12828/1

diff --git a/tests/CI/buildAsterisk.sh b/tests/CI/buildAsterisk.sh
index adbc3b0..8582d04 100755
--- a/tests/CI/buildAsterisk.sh
+++ b/tests/CI/buildAsterisk.sh
@@ -123,8 +123,6 @@
 		cat_enables+=" MENUSELECT_BRIDGES MENUSELECT_CEL MENUSELECT_CDR"
 		cat_enables+=" MENUSELECT_CHANNELS MENUSELECT_CODECS MENUSELECT_FORMATS MENUSELECT_FUNCS"
 		cat_enables+=" MENUSELECT_PBX MENUSELECT_RES MENUSELECT_UTILS"
-	else
-		mod_disables+="test_utils"
 	fi
 
 	runner menuselect/menuselect `gen_cats enable $cat_enables` menuselect.makeopts
diff --git a/tests/test_utils.c b/tests/test_utils.c
index f5586d3..1005f23 100644
--- a/tests/test_utils.c
+++ b/tests/test_utils.c
@@ -343,6 +343,11 @@
 		break;
 	}
 
+	if (!ast_module_check("res_adsi.so")) {
+		ast_test_status_update(test, "This test skipped because deprecated module res_adsi.so is not built by default.\n");
+		return AST_TEST_PASS;
+	}
+
 	if (!(c = ast_dummy_channel_alloc())) {
 		return AST_TEST_FAIL;
 	}

-- 
To view, visit https://gerrit.asterisk.org/c/asterisk/+/12828
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: certified/16.3
Gerrit-Change-Id: I52be64c8f6af222e15148a856d1f10cb113e1e94
Gerrit-Change-Number: 12828
Gerrit-PatchSet: 1
Gerrit-Owner: Christian Savinovich <csavinovich at digium.com>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20190904/571b8f3e/attachment-0001.html>