From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 14 Apr 2025 13:31:53 +0000 (+0900)
Subject: test: drop error conditions for old kernels (<3.2)
X-Git-Tag: v258-rc1~818
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b01f00e9c5409771fb5eacc018d2b49bc002f67d;p=thirdparty%2Fsystemd.git

test: drop error conditions for old kernels (<3.2)

Now our baseline on the kernel is 5.4.
---

diff --git a/src/test/test-capability.c b/src/test/test-capability.c
index 314c92fe3ce..9d863daf2b4 100644
--- a/src/test/test-capability.c
+++ b/src/test/test-capability.c
@@ -39,8 +39,8 @@ static void test_last_cap_file(void) {
         int r;
 
         r = read_one_line_file("/proc/sys/kernel/cap_last_cap", &content);
-        if (r == -ENOENT || ERRNO_IS_NEG_PRIVILEGE(r)) /* kernel pre 3.2 or no access */
-                return;
+        if (ERRNO_IS_NEG_PRIVILEGE(r))
+                return (void) log_tests_skipped_errno(r, "Failed to /proc/sys/kernel/cap_last_cap");
         ASSERT_OK(r);
 
         r = safe_atolu(content, &val);
@@ -235,8 +235,8 @@ static void test_ensure_cap_64_bit(void) {
         int r;
 
         r = read_one_line_file("/proc/sys/kernel/cap_last_cap", &content);
-        if (r == -ENOENT || ERRNO_IS_NEG_PRIVILEGE(r)) /* kernel pre 3.2 or no access */
-                return;
+        if (ERRNO_IS_NEG_PRIVILEGE(r))
+                return (void) log_tests_skipped_errno(r, "Failed to /proc/sys/kernel/cap_last_cap");
         ASSERT_OK(r);
 
         ASSERT_OK(safe_atolu(content, &p));