[igt-dev] [PATCH i-g-t 7/9] KUnit: Remove igt_kselftest fallback

[Mauro Carvalho Chehab]

On Mon, 12 Jun 2023 14:49:14 +0200
Dominik Karol Piatkowski <dominik.karol.piatkowski at intel.com> wrote:

> As igt_kselftest fallback is removed, igt_kunit does not need
> to return a value.
> 
> Signed-off-by: Dominik Karol Piątkowski <dominik.karol.piatkowski at intel.com>
> Cc: Janusz Krzysztofik <janusz.krzysztofik at linux.intel.com>
> Cc: Mauro Carvalho Chehab <mauro.chehab at linux.intel.com>

LGTM.

Reviewed-by: Mauro Carvalho Chehab <mchehab at kernel.org>

> ---
>  lib/igt_kmod.c       | 16 ++++++----------
>  lib/igt_kmod.h       |  2 +-
>  tests/drm_buddy.c    |  4 +---
>  tests/drm_mm.c       |  5 +----
>  tests/kms_selftest.c |  2 --
>  5 files changed, 9 insertions(+), 20 deletions(-)
> 
> diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c
> index 2c0cc026d..a6e751482 100644
> --- a/lib/igt_kmod.c
> +++ b/lib/igt_kmod.c
> @@ -754,7 +754,7 @@ void igt_kselftest_get_tests(struct kmod_module *kmod,
>   *
>   * Returns: IGT default codes
>   */
> -static int __igt_kunit(const char *module_name, const char *opts)
> +static void __igt_kunit(const char *module_name, const char *opts)
>  {
>  	struct igt_ktest tst;
>  	struct kmod_module *kunit_kmod;
> @@ -764,19 +764,17 @@ static int __igt_kunit(const char *module_name, const char *opts)
>  	struct ktap_test_results *results;
>  	struct ktap_test_results_element *temp;
>  
> -	ret = IGT_EXIT_INVALID;
> -
>  	/* get normalized module name */
>  	if (igt_ktest_init(&tst, module_name) != 0) {
>  		igt_warn("Unable to initialize ktest for %s\n", module_name);
> -		return ret;
> +		igt_fail(IGT_EXIT_SKIP);
>  	}
>  
>  	if (igt_ktest_begin(&tst) != 0) {
>  		igt_warn("Unable to begin ktest for %s\n", module_name);
>  
>  		igt_ktest_fini(&tst);
> -		return ret;
> +		igt_fail(IGT_EXIT_SKIP);
>  	}
>  
>  	if (tst.kmsg < 0) {
> @@ -841,14 +839,13 @@ unload:
>  	ret = ktap_parser_stop();
>  
>  	if (ret != 0)
> -		ret = IGT_EXIT_ABORT;
> +		igt_fail(IGT_EXIT_ABORT);
>  
>  	if (ret == 0)
>  		igt_success();
> -	return ret;
>  }
>  
> -int igt_kunit(const char *module_name, const char *name, const char *opts)
> +void igt_kunit(const char *module_name, const char *name, const char *opts)
>  {
>  	/*
>  	 * We need to use igt_subtest here, as otherwise it may crash with:
> @@ -861,8 +858,7 @@ int igt_kunit(const char *module_name, const char *name, const char *opts)
>  		name = "all-tests";
>  
>  	igt_subtest_with_dynamic(name)
> -		return __igt_kunit(module_name, opts);
> -	return 0;
> +		__igt_kunit(module_name, opts);
>  }
>  
>  static int open_parameters(const char *module_name)
> diff --git a/lib/igt_kmod.h b/lib/igt_kmod.h
> index 248955475..990e5309d 100644
> --- a/lib/igt_kmod.h
> +++ b/lib/igt_kmod.h
> @@ -71,7 +71,7 @@ static inline int igt_xe_driver_unload(void)
>  int igt_amdgpu_driver_load(const char *opts);
>  int igt_amdgpu_driver_unload(void);
>  
> -int igt_kunit(const char *module_name, const char *name, const char *opts);
> +void igt_kunit(const char *module_name, const char *name, const char *opts);
>  
>  void igt_kselftests(const char *module_name,
>  		    const char *module_options,
> diff --git a/tests/drm_buddy.c b/tests/drm_buddy.c
> index 09feaf635..4f411464a 100644
> --- a/tests/drm_buddy.c
> +++ b/tests/drm_buddy.c
> @@ -10,7 +10,5 @@ IGT_TEST_DESCRIPTION("Basic sanity check of DRM's buddy allocator (struct drm_bu
>  
>  igt_main
>  {
> -	int ret = igt_kunit("drm_buddy_test", NULL, NULL);
> -	if (ret != 0 && ret != IGT_EXIT_ABORT)
> -		igt_kselftests("test-drm_buddy", NULL, NULL, NULL);
> +	igt_kunit("drm_buddy_test", NULL, NULL);
>  }
> diff --git a/tests/drm_mm.c b/tests/drm_mm.c
> index ada8cb936..089eae2b9 100644
> --- a/tests/drm_mm.c
> +++ b/tests/drm_mm.c
> @@ -156,8 +156,5 @@ IGT_TEST_DESCRIPTION("Basic sanity check of DRM's range manager (struct drm_mm)"
>  
>  igt_main
>  {
> -	int ret = igt_kunit("drm_mm_test", NULL, NULL);
> -
> -	if (ret != 0 && ret != IGT_EXIT_ABORT)
> -		igt_kselftests("test-drm_mm", NULL, NULL, NULL);
> +	igt_kunit("drm_mm_test", NULL, NULL);
>  }
> diff --git a/tests/kms_selftest.c b/tests/kms_selftest.c
> index d83e5ff4b..5495c24f2 100644
> --- a/tests/kms_selftest.c
> +++ b/tests/kms_selftest.c
> @@ -46,6 +46,4 @@ igt_main
>  
>  	for (int i = 0; kunit_subtests[i].kunit != NULL; i++)
>  		igt_kunit(kunit_subtests[i].kunit, kunit_subtests[i].name, NULL);
> -
> -	igt_kselftests("test-drm_modeset", NULL, NULL, NULL);
>  }