| From 0a4593db65a2bcbd3fd14ef2e984202b75fb64d8 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Mon, 8 Apr 2024 09:46:21 +0200 |
| Subject: kunit: Fix timeout message |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Mickaël Salaün <mic@digikod.net> |
| |
| [ Upstream commit 53026ff63bb07c04a0e962a74723eb10ff6f9dc7 ] |
| |
| The exit code is always checked, so let's properly handle the -ETIMEDOUT |
| error code. |
| |
| Cc: Brendan Higgins <brendanhiggins@google.com> |
| Cc: Shuah Khan <skhan@linuxfoundation.org> |
| Reviewed-by: Kees Cook <keescook@chromium.org> |
| Reviewed-by: David Gow <davidgow@google.com> |
| Reviewed-by: Rae Moar <rmoar@google.com> |
| Signed-off-by: Mickaël Salaün <mic@digikod.net> |
| Link: https://lore.kernel.org/r/20240408074625.65017-4-mic@digikod.net |
| Signed-off-by: Shuah Khan <skhan@linuxfoundation.org> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| 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 d9d1df28cc52e..9c9e4dcf06d96 100644 |
| --- a/lib/kunit/try-catch.c |
| +++ b/lib/kunit/try-catch.c |
| @@ -78,7 +78,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); |
| } |
| @@ -93,6 +92,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.43.0 |
| |
