From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) by gabe.freedesktop.org (Postfix) with ESMTPS id 6800E10E35D for ; Tue, 26 Sep 2023 07:37:03 +0000 (UTC) Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-9adb9fa7200so1819993966b.0 for ; Tue, 26 Sep 2023 00:37:03 -0700 (PDT) Message-ID: Date: Tue, 26 Sep 2023 10:36:54 +0300 MIME-Version: 1.0 Content-Language: en-US To: Rob Clark , igt-dev@lists.freedesktop.org References: <20230925162212.125997-1-robdclark@gmail.com> From: Juha-Pekka Heikkila In-Reply-To: <20230925162212.125997-1-robdclark@gmail.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Subject: Re: [igt-dev] [PATCH v2] core_getversion: Test for desired device List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: juhapekka.heikkila@gmail.com Cc: Rob Clark , Helen Koike , Emma Anholt Errors-To: igt-dev-bounces@lists.freedesktop.org Sender: "igt-dev" List-ID: +CC Kamil I think this interest Kamil /Juha-Pekka On 25.9.2023 19.22, 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. > > Signed-off-by: Rob Clark > --- > 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..a13cc9c5c288 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_REQUIRED_DRIVER"); > > - fd = drm_open_driver(DRIVER_ANY); > + fd = __drm_open_driver(DRIVER_ANY); > + igt_assert_fd(fd); > 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);