Commit 53026ff6 authored by Mickaël Salaün's avatar Mickaël Salaün Committed by Shuah Khan
Browse files

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: default avatarKees Cook <keescook@chromium.org>
Reviewed-by: default avatarDavid Gow <davidgow@google.com>
Reviewed-by: default avatarRae Moar <rmoar@google.com>
Signed-off-by: default avatarMickaël Salaün <mic@digikod.net>
Link: https://lore.kernel.org/r/20240408074625.65017-4-mic@digikod.net


Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent f8aa1b98

lib/kunit/try-catch.c

+2 −1
Original line number Diff line number Diff line
@@ -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);