diff options
Diffstat (limited to 'src/test/test-netlink-manual.c')
| -rw-r--r-- | src/test/test-netlink-manual.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/src/test/test-netlink-manual.c b/src/test/test-netlink-manual.c index eed610b27a..1ebe8d1972 100644 --- a/src/test/test-netlink-manual.c +++ b/src/test/test-netlink-manual.c @@ -10,6 +10,7 @@ #include "macro.h" #include "module-util.h" +#include "tests.h" #include "util.h" static int load_module(const char *mod_name) { @@ -47,10 +48,14 @@ static int test_tunnel_configure(sd_netlink *rtnl) { /* skip test if module cannot be loaded */ r = load_module("ipip"); if (r < 0) - return EXIT_TEST_SKIP; + return log_tests_skipped_errno(r, "failed to load module 'ipip'"); + + r = load_module("sit"); + if (r < 0) + return log_tests_skipped_errno(r, "failed to load module 'sit'"); if (getuid() != 0) - return EXIT_TEST_SKIP; + return log_tests_skipped("not root"); /* IPIP tunnel */ assert_se(sd_rtnl_message_new_link(rtnl, &m, RTM_NEWLINK, 0) >= 0); @@ -76,10 +81,6 @@ static int test_tunnel_configure(sd_netlink *rtnl) { assert_se((m = sd_netlink_message_unref(m)) == NULL); - r = load_module("sit"); - if (r < 0) - return EXIT_TEST_SKIP; - /* sit */ assert_se(sd_rtnl_message_new_link(rtnl, &n, RTM_NEWLINK, 0) >= 0); assert_se(n); @@ -113,6 +114,8 @@ int main(int argc, char *argv[]) { sd_netlink *rtnl; int r; + test_setup_logging(LOG_INFO); + assert_se(sd_netlink_open(&rtnl) >= 0); assert_se(rtnl); |