Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
* [igt-dev] [PATCH v4] core_getversion: Test for desired device
@ 2023-09-28 21:05 Rob Clark
  2023-09-28 21:38 ` [igt-dev] ✗ GitLab.Pipeline: warning for core_getversion: Test for desired device (rev3) Patchwork
                   ` (4 more replies)
  0 siblings, 5 replies; 7+ messages in thread
From: Rob Clark @ 2023-09-28 21:05 UTC (permalink / raw)
  To: igt-dev; +Cc: Rob Clark, Emma Anholt, Helen Koike

From: Rob Clark <robdclark@chromium.org>

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 <robdclark@chromium.org>
Acked-by: Helen Koike <helen.koike@collabora.com>
Reviewed-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com>
---
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);
+	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);
-- 
2.41.0

^ permalink raw reply related	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2023-09-29 14:45 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-09-28 21:05 [igt-dev] [PATCH v4] core_getversion: Test for desired device Rob Clark
2023-09-28 21:38 ` [igt-dev] ✗ GitLab.Pipeline: warning for core_getversion: Test for desired device (rev3) Patchwork
2023-09-28 22:03 ` [igt-dev] ✓ CI.xeBAT: success " Patchwork
2023-09-28 22:07 ` [igt-dev] ✓ Fi.CI.BAT: " Patchwork
2023-09-29  6:48 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
2023-09-29  9:34 ` [igt-dev] [PATCH v4] core_getversion: Test for desired device Kamil Konieczny
2023-09-29 14:45   ` Helen Koike

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox