aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMickaël Salaün <[email protected]>2024-04-08 09:46:21 +0200
committerShuah Khan <[email protected]>2024-05-06 14:22:02 -0600
commit53026ff63bb07c04a0e962a74723eb10ff6f9dc7 (patch)
treed40119cdd84554fafb5fb105f055949b472452d0
parentf8aa1b98ce40184521ed95ec26cc115a255183b2 (diff)
kunit: Fix timeout message
The exit code is always checked, so let's properly handle the -ETIMEDOUT error code. Cc: Brendan Higgins <[email protected]> Cc: Shuah Khan <[email protected]> Reviewed-by: Kees Cook <[email protected]> Reviewed-by: David Gow <[email protected]> Reviewed-by: Rae Moar <[email protected]> Signed-off-by: Mickaël Salaün <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Shuah Khan <[email protected]>
-rw-r--r--lib/kunit/try-catch.c3
1 files changed, 2 insertions, 1 deletions
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);