From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga03.intel.com (mga03.intel.com [134.134.136.65]) by gabe.freedesktop.org (Postfix) with ESMTPS id B853710E121 for ; Fri, 3 Mar 2023 11:07:45 +0000 (UTC) From: Dominik Karol Piatkowski To: igt-dev@lists.freedesktop.org Date: Fri, 3 Mar 2023 12:07:15 +0100 Message-Id: <20230303110715.8183-5-dominik.karol.piatkowski@intel.com> In-Reply-To: <20230303110715.8183-1-dominik.karol.piatkowski@intel.com> References: <20230303110715.8183-1-dominik.karol.piatkowski@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Subject: [igt-dev] [PATCH i-g-t 4/4] tests: DRM selftests: switch to KUnit List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Isabella Basso Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: From: Isabella Basso As the DRM selftests are now using KUnit [1], update IGT tests as well. [1] - https://lore.kernel.org/all/20220708203052.236290-1-maira.canal@usp.br/ Signed-off-by: Isabella Basso v1 -> v2: - drm_buddy|drm_mm: fallback to igt_kselftests if igt_kunit failed with code other than IGT_EXIT_ABORT - kms_selftest: move igt_kunit tests to separate subtests - kms_selftest: fallback to igt_kselftests if all subtests failed Co-authored-by: Dominik Karol Piątkowski --- tests/drm_buddy.c | 4 +++- tests/drm_mm.c | 4 +++- tests/kms_selftest.c | 17 ++++++++++++++++- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/tests/drm_buddy.c b/tests/drm_buddy.c index 06876e0c..3261f0d6 100644 --- a/tests/drm_buddy.c +++ b/tests/drm_buddy.c @@ -10,5 +10,7 @@ IGT_TEST_DESCRIPTION("Basic sanity check of DRM's buddy allocator (struct drm_bu igt_main { - igt_kselftests("test-drm_buddy", NULL, NULL, NULL); + int ret = igt_kunit("drm_buddy_test", NULL); + if (ret != 0 && ret != IGT_EXIT_ABORT) + igt_kselftests("test-drm_buddy", NULL, NULL, NULL); } diff --git a/tests/drm_mm.c b/tests/drm_mm.c index 2052b115..46d0142f 100644 --- a/tests/drm_mm.c +++ b/tests/drm_mm.c @@ -28,5 +28,7 @@ IGT_TEST_DESCRIPTION("Basic sanity check of DRM's range manager (struct drm_mm)" igt_main { - igt_kselftests("test-drm_mm", NULL, NULL, NULL); + int ret = igt_kunit("drm_mm_test", NULL); + if (ret != 0 && ret != IGT_EXIT_ABORT) + igt_kselftests("test-drm_mm", NULL, NULL, NULL); } diff --git a/tests/kms_selftest.c b/tests/kms_selftest.c index abc4bfe9..88d48545 100644 --- a/tests/kms_selftest.c +++ b/tests/kms_selftest.c @@ -28,5 +28,20 @@ IGT_TEST_DESCRIPTION("Basic sanity check of KMS selftests."); igt_main { - igt_kselftests("test-drm_modeset", NULL, NULL, NULL); + int ret; + int passed = 0; + static const char *kunit_subtests[] = { "drm_cmdline_parser_test", "drm_damage_helper_test", + "drm_dp_mst_helper_test", "drm_format_helper_test", + "drm_format_test", "drm_framebuffer_test", + "drm_plane_helper_test", NULL }; + + for (int i = 0; kunit_subtests[i] != NULL; i++) + igt_subtest(kunit_subtests[i]) { + ret = igt_kunit(kunit_subtests[i], NULL); + passed += (ret == 0); + igt_assert(ret == 0); + } + + if (passed == 0) + igt_kselftests("test-drm_modeset", NULL, NULL, NULL); } -- 2.34.1