selftests/landlock: Clean up error logs related to capabilities

It doesn't help to call TH_LOG() for every cap_*() error. Let's only
log errors returned by the kernel, not by libcap specificities.

Link: https://lore.kernel.org/r/20240125153230.3817165-3-mic@digikod.net
Signed-off-by: Mickaël Salaün <mic@digikod.net>

diff --git a/tools/testing/selftests/landlock/common.h b/tools/testing/selftests/landlock/common.h
index e64bbdf0e86eac8bf1751ee287508aca1a7ed27c..425c5698aea2394f9184dfdae66b635f3063870b 100644 (file)
--- a/tools/testing/selftests/landlock/common.h
+++ b/tools/testing/selftests/landlock/common.h
@@ -128,31 +128,19 @@ static void _init_caps(struct __test_metadata *const _metadata, bool drop_all)
                EXPECT_EQ(0, cap_set_secbits(noroot));
 
        cap_p = cap_get_proc();
-       EXPECT_NE(NULL, cap_p)
-       {
-               TH_LOG("Failed to cap_get_proc: %s", strerror(errno));
-       }
-       EXPECT_NE(-1, cap_clear(cap_p))
-       {
-               TH_LOG("Failed to cap_clear: %s", strerror(errno));
-       }
+       EXPECT_NE(NULL, cap_p);
+       EXPECT_NE(-1, cap_clear(cap_p));
        if (!drop_all) {
                EXPECT_NE(-1, cap_set_flag(cap_p, CAP_PERMITTED,
-                                          ARRAY_SIZE(caps), caps, CAP_SET))
-               {
-                       TH_LOG("Failed to cap_set_flag: %s", strerror(errno));
-               }
+                                          ARRAY_SIZE(caps), caps, CAP_SET));
        }
 
        /* Automatically resets ambient capabilities. */
        EXPECT_NE(-1, cap_set_proc(cap_p))
        {
-               TH_LOG("Failed to cap_set_proc: %s", strerror(errno));
-       }
-       EXPECT_NE(-1, cap_free(cap_p))
-       {
-               TH_LOG("Failed to cap_free: %s", strerror(errno));
+               TH_LOG("Failed to set capabilities: %s", strerror(errno));
        }
+       EXPECT_NE(-1, cap_free(cap_p));
 
        /* Quickly checks that ambient capabilities are cleared. */
        EXPECT_NE(-1, cap_get_ambient(caps[0]));
@@ -176,22 +164,13 @@ static void _change_cap(struct __test_metadata *const _metadata,
        cap_t cap_p;
 
        cap_p = cap_get_proc();
-       EXPECT_NE(NULL, cap_p)
-       {
-               TH_LOG("Failed to cap_get_proc: %s", strerror(errno));
-       }
-       EXPECT_NE(-1, cap_set_flag(cap_p, flag, 1, &cap, value))
-       {
-               TH_LOG("Failed to cap_set_flag: %s", strerror(errno));
-       }
+       EXPECT_NE(NULL, cap_p);
+       EXPECT_NE(-1, cap_set_flag(cap_p, flag, 1, &cap, value));
        EXPECT_NE(-1, cap_set_proc(cap_p))
        {
-               TH_LOG("Failed to cap_set_proc: %s", strerror(errno));
-       }
-       EXPECT_NE(-1, cap_free(cap_p))
-       {
-               TH_LOG("Failed to cap_free: %s", strerror(errno));
+               TH_LOG("Failed to set capability %d: %s", cap, strerror(errno));
        }
+       EXPECT_NE(-1, cap_free(cap_p));
 }
 
 static void __maybe_unused set_cap(struct __test_metadata *const _metadata,