From bb4febf4c15800da368f161c07d0f77e2604e503 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 20 Oct 2020 18:02:54 +0200 Subject: [PATCH] test-ipcrm: modernize, skip test on permission errors I now get: $ build/test-ipcrm Failed to enter shared memory directory /dev/shm/multipath: Permission denied test-ipcrm: No privileges, skipping tests. --- src/test/test-ipcrm.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/src/test/test-ipcrm.c b/src/test/test-ipcrm.c index 4b658a0bdbb..4565d656768 100644 --- a/src/test/test-ipcrm.c +++ b/src/test/test-ipcrm.c @@ -1,11 +1,12 @@ /* SPDX-License-Identifier: LGPL-2.1+ */ #include "clean-ipc.h" -#include "user-util.h" +#include "errno-util.h" +#include "main-func.h" #include "tests.h" -#include "util.h" +#include "user-util.h" -int main(int argc, char *argv[]) { +static int run(int argc, char *argv[]) { uid_t uid; int r; const char* name = argv[1] ?: NOBODY_USER_NAME; @@ -15,11 +16,14 @@ int main(int argc, char *argv[]) { r = get_user_creds(&name, &uid, NULL, NULL, NULL, 0); if (r == -ESRCH) return log_tests_skipped("Failed to resolve user"); - if (r < 0) { - log_error_errno(r, "Failed to resolve \"%s\": %m", name); - return EXIT_FAILURE; - } + if (r < 0) + return log_error_errno(r, "Failed to resolve \"%s\": %m", name); r = clean_ipc_by_uid(uid); - return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + if (ERRNO_IS_PRIVILEGE(r)) + return log_tests_skipped("No privileges"); + + return r; } + +DEFINE_MAIN_FUNCTION_WITH_POSITIVE_FAILURE(run); -- 2.47.3