Commit ff10c99a authored by Michal Wajdeczko's avatar Michal Wajdeczko
Browse files

drm/xe/kunit: Simplify xe_dma_buf live tests code layout 



The test case logic is implemented by the functions compiled as
part of the core Xe driver module and then exported to build and
register the test suite in the live test module.

But we don't need to export individual test case functions, we may
just export the entire test suite. And we don't need to register
this test suite in a separate file, it can be done in the main
file of the live test module.

Signed-off-by: default avatarMichal Wajdeczko <michal.wajdeczko@intel.com>
Reviewed-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20240708111210.1154-3-michal.wajdeczko@intel.com
parent d6e850ac

drivers/gpu/drm/xe/tests/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
# "live" kunit tests

obj-$(CONFIG_DRM_XE_KUNIT_TEST) += xe_live_test.o

xe_live_test-y = xe_live_test_mod.o \

	xe_dma_buf_test.o \

	xe_migrate_test.o \

	xe_mocs_test.o

drivers/gpu/drm/xe/tests/xe_dma_buf.c

+13 −3
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ 
#include <kunit/test.h>

#include <kunit/visibility.h>



#include "tests/xe_dma_buf_test.h"

#include "tests/xe_pci_test.h"



#include "xe_pci.h"
@@ -274,8 +273,19 @@ static int dma_buf_run_device(struct xe_device *xe) 
	return 0;

}



void xe_dma_buf_kunit(struct kunit *test)

static void xe_dma_buf_kunit(struct kunit *test)

{

	xe_call_for_each_device(dma_buf_run_device);

}

EXPORT_SYMBOL_IF_KUNIT(xe_dma_buf_kunit);
 


static struct kunit_case xe_dma_buf_tests[] = {

	KUNIT_CASE(xe_dma_buf_kunit),

	{}

};



VISIBLE_IF_KUNIT

struct kunit_suite xe_dma_buf_test_suite = {

	.name = "xe_dma_buf",

	.test_cases = xe_dma_buf_tests,

};

EXPORT_SYMBOL_IF_KUNIT(xe_dma_buf_test_suite);

drivers/gpu/drm/xe/tests/xe_dma_buf_test.c

deleted100644 → 0
+0 −20
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

/*

 * Copyright © 2022 Intel Corporation

 */



#include "xe_dma_buf_test.h"



#include <kunit/test.h>



static struct kunit_case xe_dma_buf_tests[] = {

	KUNIT_CASE(xe_dma_buf_kunit),

	{}

};



static struct kunit_suite xe_dma_buf_test_suite = {

	.name = "xe_dma_buf",

	.test_cases = xe_dma_buf_tests,

};



kunit_test_suite(xe_dma_buf_test_suite);

drivers/gpu/drm/xe/tests/xe_dma_buf_test.h

deleted100644 → 0
+0 −13
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 AND MIT */

/*

 * Copyright © 2023 Intel Corporation

 */



#ifndef _XE_DMA_BUF_TEST_H_

#define _XE_DMA_BUF_TEST_H_



struct kunit;



void xe_dma_buf_kunit(struct kunit *test);



#endif

drivers/gpu/drm/xe/tests/xe_live_test_mod.c

+2 −0
Original line number Diff line number Diff line
@@ -6,8 +6,10 @@ 
#include <kunit/test.h>



extern struct kunit_suite xe_bo_test_suite;

extern struct kunit_suite xe_dma_buf_test_suite;



kunit_test_suite(xe_bo_test_suite);

kunit_test_suite(xe_dma_buf_test_suite);



MODULE_AUTHOR("Intel Corporation");

MODULE_LICENSE("GPL");