From 34a7ca6db24f285facf0cb409120ab6fd9fd975a Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 19 Sep 2024 12:04:34 +0200 Subject: [PATCH] test-process-util: Use FORK_REOPEN_LOG everywhere we close all fds To make sure logging works in the child processes. --- src/test/test-process-util.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/test/test-process-util.c b/src/test/test-process-util.c index 7b5e2ebfb21..bf4d94e8c05 100644 --- a/src/test/test-process-util.c +++ b/src/test/test-process-util.c @@ -710,7 +710,7 @@ TEST(setpriority_closest) { int r; r = safe_fork("(test-setprio)", - FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGTERM|FORK_WAIT|FORK_LOG, NULL); + FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_DEATHSIG_SIGTERM|FORK_WAIT|FORK_LOG|FORK_REOPEN_LOG, NULL); ASSERT_OK(r); if (r == 0) { @@ -883,7 +883,7 @@ TEST(get_process_threads) { int r; /* Run this test in a child, so that we can guarantee there's exactly one thread around in the child */ - r = safe_fork("(nthreads)", FORK_RESET_SIGNALS|FORK_DEATHSIG_SIGTERM|FORK_REOPEN_LOG|FORK_WAIT|FORK_LOG, NULL); + r = safe_fork("(nthreads)", FORK_RESET_SIGNALS|FORK_DEATHSIG_SIGTERM|FORK_WAIT|FORK_LOG, NULL); ASSERT_OK(r); if (r == 0) { @@ -927,7 +927,7 @@ TEST(get_process_threads) { TEST(is_reaper_process) { int r; - r = safe_fork("(regular)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_WAIT, NULL); + r = safe_fork("(regular)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_REOPEN_LOG|FORK_WAIT, NULL); ASSERT_OK(r); if (r == 0) { /* child */ @@ -936,7 +936,7 @@ TEST(is_reaper_process) { _exit(EXIT_SUCCESS); } - r = safe_fork("(newpid)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_WAIT, NULL); + r = safe_fork("(newpid)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_REOPEN_LOG|FORK_WAIT, NULL); ASSERT_OK(r); if (r == 0) { /* child */ @@ -948,7 +948,7 @@ TEST(is_reaper_process) { } } - r = safe_fork("(newpid1)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_WAIT, NULL); + r = safe_fork("(newpid1)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_REOPEN_LOG|FORK_WAIT, NULL); ASSERT_OK(r); if (r == 0) { /* grandchild, which is PID1 in a pidns */ @@ -960,7 +960,7 @@ TEST(is_reaper_process) { _exit(EXIT_SUCCESS); } - r = safe_fork("(subreaper)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_WAIT, NULL); + r = safe_fork("(subreaper)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_REOPEN_LOG|FORK_WAIT, NULL); ASSERT_OK(r); if (r == 0) { /* child */ @@ -982,7 +982,7 @@ TEST(pid_get_start_time) { _cleanup_(pidref_done_sigkill_wait) PidRef child = PIDREF_NULL; - ASSERT_OK(pidref_safe_fork("(stub)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS, &child)); + ASSERT_OK(pidref_safe_fork("(stub)", FORK_RESET_SIGNALS|FORK_CLOSE_ALL_FDS|FORK_REOPEN_LOG, &child)); usec_t start_time2; ASSERT_OK(pidref_get_start_time(&child, &start_time2)); -- 2.47.3