diff mbox

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

Message ID 1461160822-9177-3-git-send-email-robert.foss@collabora.com (mailing list archive)
State New, archived
Headers show

Commit Message

Robert Foss April 20, 2016, 2 p.m. UTC
From: Robert Foss <robert.foss@collabora.com>

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

Signed-off-by: Robert Foss <robert.foss@collabora.com>
---
 tests/core_getversion.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Daniel Vetter April 20, 2016, 2:28 p.m. UTC | #1
On Wed, Apr 20, 2016 at 10:00:22AM -0400, robert.foss@collabora.com wrote:
> From: Robert Foss <robert.foss@collabora.com>
> 
> 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.

> The assert(major < 1) is only needed for the legacy intel driver.
> 
> Signed-off-by: Robert Foss <robert.foss@collabora.com>
> ---
>  tests/core_getversion.c | 4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/core_getversion.c b/tests/core_getversion.c
> index b336e9f..db28c8d 100644
> --- a/tests/core_getversion.c
> +++ b/tests/core_getversion.c
> @@ -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

> +		igt_assert_lt(1, v->version_major);
> +
>  	drmFree(v);
>  	close(fd);
>  }
> -- 
> 2.5.0
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
diff mbox

Patch

diff --git a/tests/core_getversion.c b/tests/core_getversion.c
index b336e9f..db28c8d 100644
--- a/tests/core_getversion.c
+++ b/tests/core_getversion.c
@@ -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);
 }