[Piglit] [PATCH 3/9] GL3.2 GL_ARB_sync: Test that the correct errors are being outputted from invalid input in DeleteSync

[Kenneth Graunke]

On 07/25/2013 03:43 PM, Nicholas Mack wrote:
> ---
>   tests/spec/arb_sync/CMakeLists.gl.txt   |  2 +-
>   tests/spec/arb_sync/DeleteSync-errors.c | 72 +++++++++++++++++++++++++++++++++
>   2 files changed, 73 insertions(+), 1 deletion(-)
>   create mode 100644 tests/spec/arb_sync/DeleteSync-errors.c
>
> diff --git a/tests/spec/arb_sync/CMakeLists.gl.txt b/tests/spec/arb_sync/CMakeLists.gl.txt
> index 226cc53..7cb80ea 100644
> --- a/tests/spec/arb_sync/CMakeLists.gl.txt
> +++ b/tests/spec/arb_sync/CMakeLists.gl.txt
> @@ -10,6 +10,6 @@ link_libraries (
>   	${OPENGL_glu_LIBRARY}
>   )
>
> -piglit_add_executable (arb_sync-client-wait-returns ClientWaitSync-returns.c)
> +piglit_add_executable (arb_sync-delete-errors DeleteSync-errors.c)
>   piglit_add_executable (arb_sync-repeat-wait repeat-wait.c)
>   piglit_add_executable (arb_sync-timeout-zero timeout-zero.c)
> diff --git a/tests/spec/arb_sync/DeleteSync-errors.c b/tests/spec/arb_sync/DeleteSync-errors.c
> new file mode 100644
> index 0000000..0cdf21b
> --- /dev/null
> +++ b/tests/spec/arb_sync/DeleteSync-errors.c
> @@ -0,0 +1,72 @@
> +/* Copyright © 2013 Intel Corporation
> + *
> + * Permission is hereby granted, free of charge, to any person obtaining a
> + * copy of this software and associated documentation files (the "Software"),
> + * to deal in the Software without restriction, including without limitation
> + * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> + * and/or sell copies of the Software, and to permit persons to whom the
> + * Software is furnished to do so, subject to the following conditions:
> + *
> + * The above copyright notice and this permission notice (including the next
> + * paragraph) shall be included in all copies or substantial portions of the
> + * Software.
> + *
> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
> + * IN THE SOFTWARE.
> + */
> +
> +/*
> + *Test DeleteSync() returns correct error messages
> + *
> + *
> + *Section 5.2(Sync Objects and Fences) on p243 of OpenGL 3.2 Core says:
> + *"DeleteSync will silently ignore a sync value of zero. An INVALID_VALUE
> + * error is generated if sync is neither zero nor the name of a sync object."
> + *
> + */
> +
> +#include "piglit-util-gl-common.h"
> +
> +PIGLIT_GL_TEST_CONFIG_BEGIN
> +
> +config.supports_gl_compat_version = 10;
> +
> +PIGLIT_GL_TEST_CONFIG_END
> +
> +enum piglit_result
> +piglit_display(void)
> +{
> +	/* UNREACHED */
> +	return PIGLIT_FAIL;
> +}
> +
> +static GLsync test;
> +static GLenum ghost = GL_FRONT;
> +
> +void
> +piglit_init(int argc, char **argv)
> +{
> +	bool pass = true;
> +
> +	//****Test for successful function calls****

It's always good to cite text that justifies your test.  For example,

/* From the ARB_sync specification:
  * "DeleteSync will silently ignore a <sync> value of zero."
  */

> +	glDeleteSync(0);
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> +	test = glFenceSync(GL_SYNC_GPU_COMMANDS_COMPLETE, 0);
> +	glDeleteSync(test);
> +	pass = piglit_check_gl_error(GL_NO_ERROR) && pass;
> +
> +	//****Test for unsuccessful function calls****
> +	glDeleteSync(1);
> +	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;

This creates a compiler warning:

tests/spec/arb_sync/DeleteSync-errors.c: In function ‘piglit_init’:
tests/spec/arb_sync/DeleteSync-errors.c:65:2: warning: passing argument 
1 of ‘piglit_dispatch_glDeleteSync’ makes pointer from integer without a 
cast [enabled by default]
   glDeleteSync(1);
   ^
tests/spec/arb_sync/DeleteSync-errors.c:65:2: note: expected ‘GLsync’ 
but argument is of type ‘int’

> +
> +	glDeleteSync((GLsync)ghost);
> +	pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;

So does this:

tests/spec/arb_sync/DeleteSync-errors.c:68:31: warning: cast to pointer 
from integer of different size [-Wint-to-pointer-cast]
   glDeleteSync((GLsync)ghost);

> +
> +	piglit_report_result(pass ? PIGLIT_PASS : PIGLIT_FAIL);
> +}
>

I would replace both with something like:

GLsync invalid = (GLsync) GL_FRONT;
glDeleteSync(invalid);
pass = piglit_check_gl_error(GL_INVALID_VALUE) && pass;