From 470da651109e2636c624ac27257a7a64472192f6 Mon Sep 17 00:00:00 2001 From: Solar Designer Date: Fri, 11 Jul 2025 00:28:14 +0200 Subject: [PATCH 1/2] test-cgroup: Ignore ENOENT from cg_create() which was the only test failure building systemd-252-51.el9 in a container, also previously reported against 252-rc1 under Gentoo in #25015 --- src/test/test-cgroup.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-cgroup.c b/src/test/test-cgroup.c index cb093c74b2..77f720fd2d 100644 --- a/src/test/test-cgroup.c +++ b/src/test/test-cgroup.c @@ -64,7 +64,7 @@ TEST(cg_create) { (void) cg_trim(test_b, /* delete_root= */ true); r = cg_create(test_a); - if (ERRNO_IS_NEG_FS_WRITE_REFUSED(r)) + if (ERRNO_IS_NEG_FS_WRITE_REFUSED(r) || r == -ENOENT) return (void) log_tests_skipped_errno(r, "%s: Failed to create cgroup %s", __func__, test_a); ASSERT_OK_EQ(r, 1); From 52fe0a490d478e26f6302cace61c83b5d23f63d2 Mon Sep 17 00:00:00 2001 From: Solar Designer Date: Fri, 11 Jul 2025 01:46:38 +0200 Subject: [PATCH 2/2] test-cgroup-util: Ignore ENXIO in one more place --- src/test/test-cgroup-util.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/test-cgroup-util.c b/src/test/test-cgroup-util.c index 44b7e6bd4f..5fa6fe2da3 100644 --- a/src/test/test-cgroup-util.c +++ b/src/test/test-cgroup-util.c @@ -258,7 +258,7 @@ TEST(proc, .sd_booted = true) { ASSERT_OK_OR(r4, -ESRCH, -ENXIO); ASSERT_OK_OR(r5, -ESRCH, -ENXIO); ASSERT_OK_OR(r6, -ESRCH, -ENXIO); - ASSERT_OK_OR(r7, -ESRCH, -ENOENT); + ASSERT_OK_OR(r7, -ESRCH, -ENXIO, -ENOENT); } }