WEXITSTATUS() is only meaningful if WIFEXITED() was true (see wait(2)). Check WIFEXITED() with ASSERT, as most tests already do, so that a signaled child does not also produce a misleading exit status failure.
Assisted-by: LLM Signed-off-by: Günther Noack <[email protected]> --- tools/testing/selftests/landlock/base_test.c | 2 +- tools/testing/selftests/landlock/fs_test.c | 10 +++++----- tools/testing/selftests/landlock/net_test.c | 14 +++++++------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/tools/testing/selftests/landlock/base_test.c b/tools/testing/selftests/landlock/base_test.c index c19aa20609d6..f7c063fdc397 100644 --- a/tools/testing/selftests/landlock/base_test.c +++ b/tools/testing/selftests/landlock/base_test.c @@ -618,7 +618,7 @@ TEST(cred_transfer) } EXPECT_EQ(child, waitpid(child, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); /* Re-checks ruleset enforcement. */ diff --git a/tools/testing/selftests/landlock/fs_test.c b/tools/testing/selftests/landlock/fs_test.c index c73a438e088f..7e36baffdf36 100644 --- a/tools/testing/selftests/landlock/fs_test.c +++ b/tools/testing/selftests/landlock/fs_test.c @@ -4644,7 +4644,7 @@ static void test_connect_to_parent(struct __test_metadata *const _metadata, /* Wait for child. */ ASSERT_EQ(child_pid, waitpid(child_pid, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); /* Clean up. */ @@ -4743,7 +4743,7 @@ static void test_connect_to_child(struct __test_metadata *const _metadata, /* Wait for child. */ ASSERT_EQ(child_pid, waitpid(child_pid, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); } @@ -5413,7 +5413,7 @@ TEST_F_FORK(layout1_bind, path_disconnected_rename) } EXPECT_EQ(child_pid, waitpid(child_pid, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); ASSERT_EQ(0, rename(dir_s4d2, dir_s1d3)) @@ -5435,7 +5435,7 @@ TEST_F_FORK(layout1_bind, path_disconnected_rename) } EXPECT_EQ(child_pid, waitpid(child_pid, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); /* @@ -7988,7 +7988,7 @@ TEST_F(audit_layout1, resolve_unix) } ASSERT_EQ(child_pid, waitpid(child_pid, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); EXPECT_EQ(0, matches_log_fs_extra(_metadata, self->audit_fd, diff --git a/tools/testing/selftests/landlock/net_test.c b/tools/testing/selftests/landlock/net_test.c index 51bcb4740dde..e194fd78d8a1 100644 --- a/tools/testing/selftests/landlock/net_test.c +++ b/tools/testing/selftests/landlock/net_test.c @@ -903,7 +903,7 @@ static void test_bind_and_connect(struct __test_metadata *const _metadata, } EXPECT_EQ(child, waitpid(child, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); /* Closes connection, if any. */ @@ -1274,7 +1274,7 @@ TEST_F(protocol, connect_unspec) } EXPECT_EQ(child, waitpid(child, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); /* Closes connection, if any. */ @@ -1373,7 +1373,7 @@ TEST_F(protocol, tcp_fastopen) } EXPECT_EQ(child, waitpid(child, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); if (client_fd != bind_fd) @@ -1528,7 +1528,7 @@ TEST_F(protocol, sendmsg_dgram) _exit(_metadata->exit_code); } EXPECT_EQ(child, waitpid(child, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); /* @@ -1571,7 +1571,7 @@ TEST_F(protocol, sendmsg_dgram) return; } EXPECT_EQ(child, waitpid(child, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); /* @@ -1642,7 +1642,7 @@ TEST_F(protocol, sendmsg_dgram) return; } EXPECT_EQ(child, waitpid(child, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); /* @@ -1677,7 +1677,7 @@ TEST_F(protocol, sendmsg_dgram) _exit(_metadata->exit_code); } EXPECT_EQ(child, waitpid(child, &status, 0)); - EXPECT_EQ(1, WIFEXITED(status)); + ASSERT_EQ(1, WIFEXITED(status)); EXPECT_EQ(EXIT_SUCCESS, WEXITSTATUS(status)); } -- 2.56.0
