[PATCH v3 3/7] kunit: Fix timeout message
From: Mickaël Salaün <mic@digikod.net>
Date: 2024-03-19 10:49:29
Also in:
kvm, linux-hardening, linux-security-module, linux-um, lkml
Subsystem:
kernel unit testing framework (kunit), library code, the rest · Maintainers:
Brendan Higgins, David Gow, Andrew Morton, Linus Torvalds
The exit code is always checked, so let's properly handle the -ETIMEDOUT error code. Cc: Brendan Higgins <redacted> Cc: Shuah Khan <skhan@linuxfoundation.org> Reviewed-by: Kees Cook <redacted> Reviewed-by: David Gow <redacted> Reviewed-by: Rae Moar <redacted> Signed-off-by: Mickaël Salaün <mic@digikod.net> Link: https://lore.kernel.org/r/20240319104857.70783-4-mic@digikod.net (local) --- Changes since v2: * Add Rae's and David's Reviewed-by. Changes since v1: * Add Kees's Reviewed-by. --- lib/kunit/try-catch.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
index 73f5007f20ea..cab8b24b5d5a 100644
--- a/lib/kunit/try-catch.c
+++ b/lib/kunit/try-catch.c@@ -79,7 +79,6 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) time_remaining = wait_for_completion_timeout(&try_completion, kunit_test_timeout()); if (time_remaining == 0) { - kunit_err(test, "try timed out\n"); try_catch->try_result = -ETIMEDOUT; kthread_stop(task_struct); }
@@ -94,6 +93,8 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context) try_catch->try_result = 0; else if (exit_code == -EINTR) kunit_err(test, "wake_up_process() was never called\n"); + else if (exit_code == -ETIMEDOUT) + kunit_err(test, "try timed out\n"); else if (exit_code) kunit_err(test, "Unknown error: %d\n", exit_code);
--
2.44.0