Skip to contentSkip to conversation

tests/core_getversion fixes for vc4.

PATCH Superseded [email protected] 2 participants 4 messages Apr 20, 2016

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

cover tests/core_getversion fixes for vc4.

From: Robert Foss <[email protected]>

This series enables tests/core_getversion to test vc4. It's been tested on rpi2 hardware and kernel 4.6.0-rc1.

Robert Foss (2):
core_getversion: Switched from igt_assert to assert helpers.
core_getversion: Only verify major version for i915.

 tests/core_getversion.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#1 lore raw

PATCH 1/2 core_getversion: Switched from igt_assert to assert helpers.

From: Robert Foss <[email protected]>

Switched to assert helpers to enable better error output.

---
 tests/core_getversion.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
tests/core_getversion.c +4 -4
index 5830068..b336e9f 100644
@@ -39,10 +39,10 @@ igt_simple_main
 
 	fd = drm_open_driver(DRIVER_ANY);
 	v = drmGetVersion(fd);
-	igt_assert(strlen(v->name) != 0);
-	igt_assert(strlen(v->date) != 0);
-	igt_assert(strlen(v->desc) != 0);
-	igt_assert(v->version_major >= 1);
+	igt_assert_neq(strlen(v->name), 0);
+	igt_assert_neq(strlen(v->date), 0);
+	igt_assert_neq(strlen(v->desc), 0);
+	igt_assert_lt(1, v->version_major);
 	drmFree(v);
 	close(fd);
 }
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#2 lore raw

PATCH 2/2 core_getversion: Only verify major version for i915.

In reply to [email protected]

From: Robert Foss <[email protected]>

This change mirrors the change in 8a5c4d567fafffbda57cbe5e4ed8c419193cada5 of drm.
The assert(major < 1) is only needed for the legacy intel driver.

---
 tests/core_getversion.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tests/core_getversion.c +3 -1
index b336e9f..db28c8d 100644
@@ -42,7 +42,9 @@ igt_simple_main
 	igt_assert_neq(strlen(v->name), 0);
 	igt_assert_neq(strlen(v->date), 0);
 	igt_assert_neq(strlen(v->desc), 0);
-	igt_assert_lt(1, v->version_major);
+	if (strcmp(v->name, "i915") == 0)
+		igt_assert_lt(1, v->version_major);
+
 	drmFree(v);
 	close(fd);
 }
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
#3 lore raw

Re: [PATCH i-g-t 2/2] core_getversion: Only verify major version for i915.

Quoted 4 lines · On Wed, Apr 20, 2016 at 10:00:22AM -0400, [email protected] wrote:

From: Robert Foss <[email protected]>

This change mirrors the change in 8a5c4d567fafffbda57cbe5e4ed8c419193cada5 of drm.

I don't have that commit in my linux.git ... Much better to also cite the commit title, not just the sha1.

Quoted 12 lines

The assert(major < 1) is only needed for the legacy intel driver.

---
 tests/core_getversion.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
tests/core_getversion.c +0 -0
index b336e9f..db28c8d 100644

tests/core_getversion.c igt_simple_main · line 45

Quoted 5 lines
tests/core_getversion.c +1 -1
@@ -42,7 +42,9 @@ igt_simple_main
 	igt_assert_neq(strlen(v->name), 0);
 	igt_assert_neq(strlen(v->date), 0);
 	igt_assert_neq(strlen(v->desc), 0);
-	igt_assert_lt(1, v->version_major);
+	if (strcmp(v->name, "i915") == 0)

Tomeu has a nice helper to check for i915.
-Daniel

Quoted 12 lines
tests/core_getversion.c +2 -0
+		igt_assert_lt(1, v->version_major);
+
 	drmFree(v);
 	close(fd);
 }
Signature · 6 lines
2.5.0

_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 7 lines
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx