kunit: Fix timeout message

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>

diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
index 73f5007f20eaa115553d0e7184bdabec33b6f5f0..cab8b24b5d5a27bc45da38f56a8bc96f08b0d5eb 100644 (file)
--- 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);