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]
---

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


Reply via email to