From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id C626110E28D for ; Mon, 5 Jun 2023 10:48:01 +0000 (UTC) From: Dominik Karol Piatkowski Date: Mon, 5 Jun 2023 12:47:14 +0200 Message-Id: <20230605104716.5678-7-dominik.karol.piatkowski@intel.com> In-Reply-To: <20230605104716.5678-1-dominik.karol.piatkowski@intel.com> References: <20230605104716.5678-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 6/8] lib/igt_kmod: place KUnit tests on a subtest List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" To: igt-dev@lists.freedesktop.org List-ID: From: Mauro Carvalho Chehab There's a hidden bug at KUnit implementation: as it doesn't place tests inside a subtest, trying to use it with igt_main causes a crash: $ ./build/tests/drm_mm --list skipping is allowed only in fixtures, subtests or igt_simple_main please refer to lib/igt_core documentation drm_mm: ../lib/igt_core.c:437: internal_assert: Assertion `0' failed. Received signal SIGABRT. Stack trace: #0 [fatal_sig_handler+0x17b] #1 [__sigaction+0x50] #2 [__pthread_kill_implementation+0x114] #3 [gsignal+0x1e] #4 [abort+0xdf] #5 [__assert_fail_base.cold+0xe] #6 [__assert_fail+0x47] #7 [internal_assert+0xe5] #8 [igt_skip+0x169] #9 [__igt_skip_check+0x1bb] #10 [igt_ktest_begin+0xa6] #11 [igt_kunit+0x70] #12 [main+0x2a] #13 [__libc_start_call_main+0x7a] #14 [__libc_start_main+0x8b] #15 [_start+0x25] Fix it by using igt_subtests() before actually implememnting KUnit logic. After the patch, it should now report subtests: $ ./build/tests/drm_mm --list all-tests Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Dominik Karol Piątkowski --- lib/igt_kmod.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/lib/igt_kmod.c b/lib/igt_kmod.c index 8cb9cb2e..1309ab21 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 */ -int igt_kunit(const char *module_name, const char *opts) +static int __igt_kunit(const char *module_name, const char *opts) { struct igt_ktest tst; struct kmod_module *kunit_kmod; @@ -852,6 +852,20 @@ unload: return ret; } +int igt_kunit(const char *module_name, const char *opts) +{ + /* + * We need to use igt_subtest here, as otherwise it may crash with: + * skipping is allowed only in fixtures, subtests or igt_simple_main + * if used on igt_main. This is also needed in order to provide + * proper namespace for dynamic subtests, with is required for CI + * and for documentation. + */ + igt_subtest_with_dynamic("all-tests") + return __igt_kunit(module_name, opts); + return 0; +} + static int open_parameters(const char *module_name) { char path[256]; -- 2.34.1