diff --git a/tests/ns/meson.build b/tests/ns/meson.build index ca0270ca37..7d4e2e30fa 100644 --- a/tests/ns/meson.build +++ b/tests/ns/meson.build @@ -14,12 +14,6 @@ foreach unit : [ 'plugin', 'query', ] - linkargs = '' - if unit == 'plugin' - linkargs = [ - '-Wl,--wrap=isc_file_exists', - ] - endif test_bin = executable( unit, files(f'@unit@_test.c', 'netmgr_wrap.c'), @@ -37,7 +31,6 @@ foreach unit : [ cmocka_dep, nghttp2_dep, ], - link_args: linkargs, ) test( diff --git a/tests/ns/plugin_test.c b/tests/ns/plugin_test.c index 1de3e7c989..521931db57 100644 --- a/tests/ns/plugin_test.c +++ b/tests/ns/plugin_test.c @@ -34,17 +34,18 @@ #include -#include "../ns/hooks.c" - -bool -__wrap_isc_file_exists(const char *pathname); - -bool -__wrap_isc_file_exists(const char *pathname) { +/* + * Mocking isc_file_exists() as it's used inside the tested + * ns_plugin_expandpath() function defined in lib/ns/hooks.c + */ +static bool +isc_file_exists(const char *pathname) { UNUSED(pathname); return mock(); } +#include "../ns/hooks.c" + #include /*% @@ -75,7 +76,7 @@ run_full_path_test(const ns_plugin_expandpath_test_params_t *test, REQUIRE(test->result != ISC_R_SUCCESS || test->output != NULL); if (test->result == ISC_R_SUCCESS) { - will_return(__wrap_isc_file_exists, test->exists); + will_return(isc_file_exists, test->exists); } /* @@ -149,7 +150,7 @@ ISC_RUN_TEST_IMPL(ns_plugin_expandpath) { .exists = false, .output_size = PATH_MAX, .result = ISC_R_SUCCESS, - .output = "/usr/lib/named/foo.so", + .output = "/usr/lib/named/foo" NAMED_PLUGINEXT, }, { NS_TEST_ID("correct use with a relative path and no " @@ -158,7 +159,7 @@ ISC_RUN_TEST_IMPL(ns_plugin_expandpath) { .exists = false, .output_size = PATH_MAX, .result = ISC_R_SUCCESS, - .output = "../../foo.so", + .output = "../../foo" NAMED_PLUGINEXT, }, { NS_TEST_ID("correct use with a filename and no " @@ -167,7 +168,7 @@ ISC_RUN_TEST_IMPL(ns_plugin_expandpath) { .exists = false, .output_size = PATH_MAX, .result = ISC_R_SUCCESS, - .output = NAMED_PLUGINDIR "/foo.so", + .output = NAMED_PLUGINDIR "/foo" NAMED_PLUGINEXT, }, { NS_TEST_ID("correct use with a filename and no " @@ -176,7 +177,7 @@ ISC_RUN_TEST_IMPL(ns_plugin_expandpath) { .exists = false, .output_size = PATH_MAX, .result = ISC_R_SUCCESS, - .output = NAMED_PLUGINDIR "/foo.bar.so", + .output = NAMED_PLUGINDIR "/foo.bar" NAMED_PLUGINEXT, }, { NS_TEST_ID("no space at all in target buffer"),