Skip to content

Commit 323feb3

Browse files
committedMay 11, 2024
selftests/harness: Handle TEST_F()'s explicit exit codes
If TEST_F() explicitly calls exit(code) with code different than 0, then _metadata->exit_code is set to this code (e.g. KVM_ONE_VCPU_TEST()). We need to keep in mind that _metadata->exit_code can be KSFT_SKIP while the process exit code is 0. Cc: Jakub Kicinski <kuba@kernel.org> Cc: Kees Cook <keescook@chromium.org> Cc: Mark Brown <broonie@kernel.org> Cc: Shuah Khan <shuah@kernel.org> Cc: Will Drewry <wad@chromium.org> Reported-by: Sean Christopherson <seanjc@google.com> Tested-by: Sean Christopherson <seanjc@google.com> Closes: https://lore.kernel.org/r/ZjPelW6-AbtYvslu@google.com Fixes: 0710a1a ("selftests/harness: Merge TEST_F_FORK() into TEST_F()") Link: https://lore.kernel.org/r/20240511171445.904356-11-mic@digikod.net Signed-off-by: Mickaël Salaün <mic@digikod.net>
1 parent f453cc3 commit 323feb3

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed
 

‎tools/testing/selftests/kselftest_harness.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -462,9 +462,13 @@ static inline pid_t clone3_vfork(void)
462462
munmap(teardown, sizeof(*teardown)); \
463463
if (self && fixture_name##_teardown_parent) \
464464
munmap(self, sizeof(*self)); \
465-
if (!WIFEXITED(status) && WIFSIGNALED(status)) \
465+
if (WIFEXITED(status)) { \
466+
if (WEXITSTATUS(status)) \
467+
_metadata->exit_code = WEXITSTATUS(status); \
468+
} else if (WIFSIGNALED(status)) { \
466469
/* Forward signal to __wait_for_test(). */ \
467470
kill(getpid(), WTERMSIG(status)); \
471+
} \
468472
__test_check_assert(_metadata); \
469473
} \
470474
static struct __test_metadata *_##fixture_name##_##test_name##_object; \

0 commit comments

Comments
 (0)
Please sign in to comment.