Re: [PATCH] drm/xe: Group live kunit tests

[Rodrigo Vivi <rodrigo.vivi@intel.com>]

On Tue, Feb 20, 2024 at 09:48:21PM -0800, Lucas De Marchi wrote:
> As was done for the normal kunit tests, group the live tests into a
> single module, xe_live_test.ko.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi@intel.com>

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>

> ---
> 
> Rebase again. Now the igt changes are merged, with the exception of the
> oneliner (extracted from
> https://lore.kernel.org/igt-dev/20240202004529.552806-3-lucas.demarchi@intel.com/)
> to actually do the rename.
> 
>  drivers/gpu/drm/xe/tests/Makefile           |  3 ++-
>  drivers/gpu/drm/xe/tests/xe_bo_test.c       |  5 -----
>  drivers/gpu/drm/xe/tests/xe_dma_buf_test.c  |  5 -----
>  drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 10 ++++++++++
>  drivers/gpu/drm/xe/tests/xe_migrate_test.c  |  5 -----
>  drivers/gpu/drm/xe/tests/xe_mocs_test.c     |  5 -----
>  6 files changed, 12 insertions(+), 21 deletions(-)
>  create mode 100644 drivers/gpu/drm/xe/tests/xe_live_test_mod.c
> 
> diff --git a/drivers/gpu/drm/xe/tests/Makefile b/drivers/gpu/drm/xe/tests/Makefile
> index 9d1d88af8b2f..8cf2367449d8 100644
> --- a/drivers/gpu/drm/xe/tests/Makefile
> +++ b/drivers/gpu/drm/xe/tests/Makefile
> @@ -1,7 +1,8 @@
>  # SPDX-License-Identifier: GPL-2.0
>  
>  # "live" kunit tests
> -obj-$(CONFIG_DRM_XE_KUNIT_TEST) += \
> +obj-$(CONFIG_DRM_XE_KUNIT_TEST) += xe_live_test.o
> +xe_live_test-y = xe_live_test_mod.o \
>  	xe_bo_test.o \
>  	xe_dma_buf_test.o \
>  	xe_migrate_test.o \
> diff --git a/drivers/gpu/drm/xe/tests/xe_bo_test.c b/drivers/gpu/drm/xe/tests/xe_bo_test.c
> index f408f17f2164..a324cde77db8 100644
> --- a/drivers/gpu/drm/xe/tests/xe_bo_test.c
> +++ b/drivers/gpu/drm/xe/tests/xe_bo_test.c
> @@ -19,8 +19,3 @@ static struct kunit_suite xe_bo_test_suite = {
>  };
>  
>  kunit_test_suite(xe_bo_test_suite);
> -
> -MODULE_AUTHOR("Intel Corporation");
> -MODULE_LICENSE("GPL");
> -MODULE_DESCRIPTION("xe_bo kunit test");
> -MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
> diff --git a/drivers/gpu/drm/xe/tests/xe_dma_buf_test.c b/drivers/gpu/drm/xe/tests/xe_dma_buf_test.c
> index 9f5a9cda8c0f..99cdb718b6c6 100644
> --- a/drivers/gpu/drm/xe/tests/xe_dma_buf_test.c
> +++ b/drivers/gpu/drm/xe/tests/xe_dma_buf_test.c
> @@ -18,8 +18,3 @@ static struct kunit_suite xe_dma_buf_test_suite = {
>  };
>  
>  kunit_test_suite(xe_dma_buf_test_suite);
> -
> -MODULE_AUTHOR("Intel Corporation");
> -MODULE_LICENSE("GPL");
> -MODULE_DESCRIPTION("xe_dma_buf kunit test");
> -MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
> diff --git a/drivers/gpu/drm/xe/tests/xe_live_test_mod.c b/drivers/gpu/drm/xe/tests/xe_live_test_mod.c
> new file mode 100644
> index 000000000000..eb1ea99a5a8b
> --- /dev/null
> +++ b/drivers/gpu/drm/xe/tests/xe_live_test_mod.c
> @@ -0,0 +1,10 @@
> +// SPDX-License-Identifier: GPL-2.0
> +/*
> + * Copyright © 2023 Intel Corporation
> + */
> +#include <linux/module.h>
> +
> +MODULE_AUTHOR("Intel Corporation");
> +MODULE_LICENSE("GPL");
> +MODULE_DESCRIPTION("xe live kunit tests");
> +MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
> diff --git a/drivers/gpu/drm/xe/tests/xe_migrate_test.c b/drivers/gpu/drm/xe/tests/xe_migrate_test.c
> index cf0c173b945f..eb0d8963419c 100644
> --- a/drivers/gpu/drm/xe/tests/xe_migrate_test.c
> +++ b/drivers/gpu/drm/xe/tests/xe_migrate_test.c
> @@ -18,8 +18,3 @@ static struct kunit_suite xe_migrate_test_suite = {
>  };
>  
>  kunit_test_suite(xe_migrate_test_suite);
> -
> -MODULE_AUTHOR("Intel Corporation");
> -MODULE_LICENSE("GPL");
> -MODULE_DESCRIPTION("xe_migrate kunit test");
> -MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
> diff --git a/drivers/gpu/drm/xe/tests/xe_mocs_test.c b/drivers/gpu/drm/xe/tests/xe_mocs_test.c
> index ee40f31e1e12..6315886b659e 100644
> --- a/drivers/gpu/drm/xe/tests/xe_mocs_test.c
> +++ b/drivers/gpu/drm/xe/tests/xe_mocs_test.c
> @@ -19,8 +19,3 @@ static struct kunit_suite xe_mocs_test_suite = {
>  };
>  
>  kunit_test_suite(xe_mocs_test_suite);
> -
> -MODULE_AUTHOR("Intel Corporation");
> -MODULE_LICENSE("GPL");
> -MODULE_DESCRIPTION("xe_mocs kunit test");
> -MODULE_IMPORT_NS(EXPORTED_FOR_KUNIT_TESTING);
> -- 
> 2.43.0
>