From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7419F10E065 for ; Fri, 29 Sep 2023 14:45:55 +0000 (UTC) Message-ID: <4c354881-d263-69a5-78ba-ca32a687e302@collabora.com> Date: Fri, 29 Sep 2023 11:45:45 -0300 MIME-Version: 1.0 To: Kamil Konieczny , igt-dev@lists.freedesktop.org, Rob Clark , Emma Anholt , Daniel Stone , Rob Clark , =?UTF-8?Q?Zbigniew_Kempczy=c5=84ski?= References: <20230928210527.268270-1-robdclark@gmail.com> <20230929093459.4dhd3tk35q6u2yd2@kamilkon-desk.igk.intel.com> Content-Language: en-US From: Helen Koike In-Reply-To: <20230929093459.4dhd3tk35q6u2yd2@kamilkon-desk.igk.intel.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit Subject: Re: [igt-dev] [PATCH v4] core_getversion: Test for desired device List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: On 29/09/2023 06:34, Kamil Konieczny wrote: > Hi Rob, > > On 2023-09-28 at 14:05:27 -0700, Rob Clark wrote: >> From: Rob Clark >> >> We discovered in drm/ci that if the drm device fails to probe, all the >> tests come back as "Skip" and the job is considered successful. Fix >> the getversion test to fail if there is no drm device or if the drm >> device does not match the expected device as specified by the optional >> IGT_REQUIRED_DRIVER environment variable. > ----- ^^^^^^^^ > FORCE > >> >> Signed-off-by: Rob Clark >> Acked-by: Helen Koike >> Reviewed-by: Zbigniew Kempczyński >> --- >> I dropped the previous two lib/drmtest patches, as they are no longer >> strictly required. I think they are still nice-to-have, but they are >> unchanged since the previous version so it didn't seem useful to re- >> send them. >> >> tests/core_getversion.c | 9 ++++++++- >> 1 file changed, 8 insertions(+), 1 deletion(-) >> >> diff --git a/tests/core_getversion.c b/tests/core_getversion.c >> index 32cb976e4923..8c8e0c9a3e5e 100644 >> --- a/tests/core_getversion.c >> +++ b/tests/core_getversion.c >> @@ -48,14 +48,21 @@ igt_simple_main >> { >> int fd; >> drmVersionPtr v; >> + const char *name = getenv("IGT_FORCE_DRIVER"); >> >> - fd = drm_open_driver(DRIVER_ANY); >> + fd = __drm_open_driver(DRIVER_ANY); > > Did you tested it? I did! :) With drm-ci: https://gitlab.freedesktop.org/helen.fo rnazier/linux/-/pipelines/997824 I could see that msm jobs failed here, but the others didn't. (the jobs from the others are red because of other failures from my tests, but core_getversion passed). Tested-by: Helen Koike > >> + igt_assert_fd(fd); > > imho better igt_assert_f(fd > 0, "Error opening driver, forced: %s\n", name ? name : "(not-used)"); > > Regards, > Kamil > >> v = drmGetVersion(fd); >> igt_assert_neq(strlen(v->name), 0); >> igt_assert_neq(strlen(v->date), 0); >> igt_assert_neq(strlen(v->desc), 0); >> if (is_i915_device(fd)) >> igt_assert_lte(1, v->version_major); >> + if (name) { >> + igt_assert_f(!strcmp(name, v->name), >> + "Expected driver \"%s\" but got \"%s\"\n", >> + name, v->name); >> + } >> >> drmFree(v); >> drm_close_driver(fd); >> -- >> 2.41.0 >>