kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-03 03:20:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Chris-Savinovich
2019-09-04 16:19:55 -05:00
parent e5b33bb979
commit eac6f2b0a2
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tests/CI/buildAsterisk.sh
View File

@@ -123,8 +123,6 @@ if [ $NO_MENUSELECT -eq 0 ] ; then
cat_enables+=" MENUSELECT_BRIDGES MENUSELECT_CEL MENUSELECT_CDR" cat_enables+=" MENUSELECT_BRIDGES MENUSELECT_CEL MENUSELECT_CDR"
cat_enables+=" MENUSELECT_CHANNELS MENUSELECT_CODECS MENUSELECT_FORMATS MENUSELECT_FUNCS" cat_enables+=" MENUSELECT_CHANNELS MENUSELECT_CODECS MENUSELECT_FORMATS MENUSELECT_FUNCS"
cat_enables+=" MENUSELECT_PBX MENUSELECT_RES MENUSELECT_UTILS" cat_enables+=" MENUSELECT_PBX MENUSELECT_RES MENUSELECT_UTILS"
else
mod_disables+="test_utils"
fi fi
runner menuselect/menuselect `gen_cats enable $cat_enables` menuselect.makeopts runner menuselect/menuselect `gen_cats enable $cat_enables` menuselect.makeopts

5
tests/test_utils.c
View File

@@ -343,6 +343,11 @@ AST_TEST_DEFINE(adsi_loaded_test)
break; 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())) { if (!(c = ast_dummy_channel_alloc())) {
return AST_TEST_FAIL; return AST_TEST_FAIL;
} }