[PATCH weston] tests: Only run buffer-count test on Mesa >= 10.1

Kristian Høgsberg hoegsberg at gmail.com
Wed Jan 8 21:20:16 PST 2014


On Wed, Jan 08, 2014 at 04:05:34PM +0200, ppaalanen at gmail.com wrote:
> From: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> 
> Comment #2 in the bug report says Mesa 10.0 branch does not have the
> fix, and indeed buffer-count test fails on Mesa 10.0.1. Fix the test to
> require Mesa 10.1 or later.
> 
> Now I correctly get:
> 	mesa version too old (OpenGL ES 3.0 Mesa 10.0.1 (git-12484d2))

You're right, thanks.  I was testing against 9.2 mesa RPMs.

Kristian

> https://bugs.freedesktop.org/show_bug.cgi?id=72835
> 
> Signed-off-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> ---
>  tests/buffer-count-test.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/buffer-count-test.c b/tests/buffer-count-test.c
> index 3b66e31..c7ddeb6 100644
> --- a/tests/buffer-count-test.c
> +++ b/tests/buffer-count-test.c
> @@ -97,7 +97,7 @@ init_egl(struct test_data *test_data)
>  			     test_data->egl_surface, test_data->egl_ctx);
>  	assert(ret == EGL_TRUE);
>  
> -	/* This test is specific to mesa 10.0 and later, which is the
> +	/* This test is specific to mesa 10.1 and later, which is the
>  	 * first release that doesn't accidentally triple-buffer. */
>  	str = (const char *) glGetString(GL_VERSION);
>  	mesa = strstr(str, "Mesa ");
> @@ -105,7 +105,7 @@ init_egl(struct test_data *test_data)
>  		skip("unknown EGL implementation (%s)\n", str);
>  	if (sscanf(mesa + 5, "%d.%d", &major, &minor) != 2)
>  		skip("unrecognized mesa version (%s)\n", str);
> -	if (major < 10)
> +	if (major < 10 || (major == 10 && minor < 1))
>  		skip("mesa version too old (%s)\n", str);
>  
>  }
> -- 
> 1.8.3.2
> 


More information about the wayland-devel mailing list