commit: 08925ddd173f638b78303c4c958d4c98a41c60d6 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Thu Apr 18 15:17:58 2024 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Thu Apr 18 15:17:58 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08925ddd
sys-apps/systemd: update systemd-test-process-util.patch Insert empty lines to maintain line numbering for subsequent tests. Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> sys-apps/systemd/files/systemd-test-process-util.patch | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sys-apps/systemd/files/systemd-test-process-util.patch b/sys-apps/systemd/files/systemd-test-process-util.patch index ec1a766764ee..92c7eaf29577 100644 --- a/sys-apps/systemd/files/systemd-test-process-util.patch +++ b/sys-apps/systemd/files/systemd-test-process-util.patch @@ -1,4 +1,4 @@ -From 1d3404701bf0c27600dd44b2814cd6caffca877a Mon Sep 17 00:00:00 2001 +From c3f91c76af292e3bd2c6e2b12e37de88cf5d7c72 Mon Sep 17 00:00:00 2001 From: Mike Gilbert <flop...@gentoo.org> Date: Thu, 18 Apr 2024 00:04:44 -0400 Subject: [PATCH] test-process-util: remove assert that fails under pid-sandbox @@ -8,23 +8,24 @@ Upstream refuses to fix this. Bug: https://bugs.gentoo.org/674458 Bug: https://github.com/systemd/systemd/issues/25015 --- - src/test/test-process-util.c | 3 --- - 1 file changed, 3 deletions(-) + src/test/test-process-util.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c -index c96bd4341b..4009cf96e2 100644 +index c96bd4341b..9ff1bdc082 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c -@@ -92,9 +92,6 @@ static void test_pid_get_comm_one(pid_t pid) { +@@ -92,8 +92,8 @@ static void test_pid_get_comm_one(pid_t pid) { assert_se(r >= 0 || r == -EACCES); log_info("PID"PID_FMT" strlen(environ): %zi", pid, env ? (ssize_t)strlen(env) : (ssize_t)-errno); - if (!detect_container()) - assert_se(get_ctty_devnr(pid, &h) == -ENXIO || pid != 1); -- ++ ++ + (void) getenv_for_pid(pid, "PATH", &i); log_info("PID"PID_FMT" $PATH: '%s'", pid, strna(i)); - } -- 2.44.0
