UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

kunit: Fix timeout message 

[ 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>
This commit is contained in:
Mickaël Salaün 2024-04-08 09:46:21 +02:00 committed by Greg Kroah-Hartman
parent 6a3cacf6d3
commit 4e40bc50da
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/kunit/try-catch.c
View File

@ -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, time_remaining = wait_for_completion_timeout(&try_completion,
kunit_test_timeout()); kunit_test_timeout());
if (time_remaining == 0) { if (time_remaining == 0) {
kunit_err(test, "try timed out\n");
try_catch->try_result = -ETIMEDOUT; try_catch->try_result = -ETIMEDOUT;
kthread_stop(task_struct); 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; try_catch->try_result = 0;
else if (exit_code == -EINTR) else if (exit_code == -EINTR)
kunit_err(test, "wake_up_process() was never called\n"); 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) else if (exit_code)
kunit_err(test, "Unknown error: %d\n", exit_code); kunit_err(test, "Unknown error: %d\n", exit_code);