From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 17 May 2022 09:13:13 +0000 (+0900)
Subject: test-boot-timestamp: use ERRNO_IS_PRIVILEGE() to also mask -EPERM
X-Git-Tag: v251~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9ce14a75e7e347a304c44edb1dfe8d92e0c04fae;p=thirdparty%2Fsystemd.git

test-boot-timestamp: use ERRNO_IS_PRIVILEGE() to also mask -EPERM

Fixes #23395.
---

diff --git a/src/test/test-boot-timestamps.c b/src/test/test-boot-timestamps.c
index 2bee2d5c1d6..a9875defdd9 100644
--- a/src/test/test-boot-timestamps.c
+++ b/src/test/test-boot-timestamps.c
@@ -6,6 +6,7 @@
 #include "acpi-fpdt.h"
 #include "boot-timestamps.h"
 #include "efi-loader.h"
+#include "errno-util.h"
 #include "log.h"
 #include "tests.h"
 #include "util.h"
@@ -16,7 +17,7 @@ static int test_acpi_fpdt(void) {
 
         r = acpi_get_boot_usec(&loader_start, &loader_exit);
         if (r < 0) {
-                bool ok = r == -ENOENT || r == -EACCES || r == -ENODATA;
+                bool ok = IN_SET(r, -ENOENT, -ENODATA) || ERRNO_IS_PRIVILEGE(r);
 
                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read ACPI FPDT: %m");
                 return ok ? 0 : r;
@@ -35,7 +36,7 @@ static int test_efi_loader(void) {
 
         r = efi_loader_get_boot_usec(&loader_start, &loader_exit);
         if (r < 0) {
-                bool ok = r == -ENOENT || r == -EACCES || r == -EOPNOTSUPP;
+                bool ok = IN_SET(r, -ENOENT, -EOPNOTSUPP) || ERRNO_IS_PRIVILEGE(r);
 
                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read EFI loader data: %m");
                 return ok ? 0 : r;
@@ -56,7 +57,7 @@ static int test_boot_timestamps(void) {
 
         r = boot_timestamps(NULL, &fw, &l);
         if (r < 0) {
-                bool ok = r == -ENOENT || r == -EACCES || r == -EOPNOTSUPP;
+                bool ok = IN_SET(r, -ENOENT, -EOPNOTSUPP) || ERRNO_IS_PRIVILEGE(r);
 
                 log_full_errno(ok ? LOG_DEBUG : LOG_ERR, r, "Failed to read variables: %m");
                 return ok ? 0 : r;