From e742ec6abc0ba5da49d5a66592c3922df7d20f4c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 11 Sep 2020 22:25:25 +0200 Subject: [PATCH] test-acl-util: skip test if /tmp doesn't do ACLs Fixes: #17013 --- src/test/test-acl-util.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/src/test/test-acl-util.c b/src/test/test-acl-util.c index 00c482efed..08764faa4f 100644 --- a/src/test/test-acl-util.c +++ b/src/test/test-acl-util.c @@ -6,13 +6,15 @@ #include #include "acl-util.h" +#include "errno-util.h" #include "fd-util.h" #include "format-util.h" #include "string-util.h" +#include "tests.h" #include "tmpfile-util.h" #include "user-util.h" -static void test_add_acls_for_user(void) { +static int test_add_acls_for_user(void) { char fn[] = "/tmp/test-empty.XXXXXX"; _cleanup_close_ int fd = -1; char *cmd; @@ -42,6 +44,9 @@ static void test_add_acls_for_user(void) { uid = getuid(); r = fd_add_uid_acl_permission(fd, uid, ACL_READ); + if (ERRNO_IS_NOT_SUPPORTED(r)) + return log_tests_skipped("no ACL support on /tmp"); + log_info_errno(r, "fd_add_uid_acl_permission(%i, "UID_FMT", ACL_READ): %m", fd, uid); assert_se(r >= 0); @@ -62,11 +67,10 @@ static void test_add_acls_for_user(void) { cmd = strjoina("getfacl -p ", fn); assert_se(system(cmd) == 0); - unlink(fn); + (void) unlink(fn); + return 0; } int main(int argc, char **argv) { - test_add_acls_for_user(); - - return 0; + return test_add_acls_for_user(); }