Merge "menuselect: Remove ineffective weak attribute detection." into 13

This commit is contained in:
Joshua Colp
2017-11-21 06:50:53 -06:00
committed by Gerrit Code Review
6 changed files with 6 additions and 374 deletions

View File

@@ -326,20 +326,6 @@ AST_TEST_DEFINE(crypto_loaded_test)
break;
}
#if 0 /* Not defined on Solaris */
ast_test_status_update(test,
"address of __stub__ast_crypto_loaded is %p\n",
__stub__ast_crypto_loaded);
#ifndef HAVE_ATTRIBUTE_weak_import
ast_test_status_update(test,
"address of __ref__ast_crypto_loaded is %p\n",
__ref__ast_crypto_loaded);
#endif
ast_test_status_update(test,
"pointer to ast_crypto_loaded is %p\n",
ast_crypto_loaded);
#endif
return ast_crypto_loaded() ? AST_TEST_PASS : AST_TEST_FAIL;
}
@@ -390,20 +376,6 @@ AST_TEST_DEFINE(agi_loaded_test)
break;
}
#if 0
ast_test_status_update(test,
"address of __stub__ast_agi_register is %p\n",
__stub__ast_agi_register);
#ifndef HAVE_ATTRIBUTE_weak_import
ast_test_status_update(test,
"address of __ref__ast_agi_register is %p\n",
__ref__ast_agi_register);
#endif
ast_test_status_update(test,
"pointer to ast_agi_register is %p\n",
ast_agi_register);
#endif
if (ast_agi_register(ast_module_info->self, &noop_command) == AST_OPTIONAL_API_UNAVAILABLE) {
ast_test_status_update(test, "Unable to register testnoop command, because res_agi is not loaded.\n");
return AST_TEST_FAIL;