[Piglit] [PATCH] glsl-1.10: Verify that "impossible" GLSL versions are properly rejected

[Paul Berry]

On 30 November 2012 10:14, Ian Romanick <idr at freedesktop.org> wrote:

> From: Ian Romanick <ian.d.romanick at intel.com>
>
> Currently on Mesa's gles3 branch this leads to an assertion failure.
> It works correctly on Mesa master and known Mesa releases.
>
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
>

When I apply this patch to Piglit master and run it using piglit-run.py, I
get the following error:

  File
"/home/pberry/.platform/piglit-mesa/piglit/source/framework/core.py", line
445, in doRun
    result = self.run(env.valgrind)
  File
"/home/pberry/.platform/piglit-mesa/piglit/source/framework/exectest.py",
line 63, in run
    if self.command is not None:
  File
"/home/pberry/.platform/piglit-mesa/piglit/source/framework/glsl_parser_test.py",
line 375, in command
    self.config.get('config', 'glsl_version')
  File "/usr/lib/python2.7/ConfigParser.py", line 618, in get
    raise NoOptionError(option, section)

I think you need to add the line "* glsl_version: 1.10" to the [config]
section.

With that fixed, this is:

Reviewed-by: Paul Berry <stereotype441 at gmail.com>


> ---
> I'm not sure this is the right place for this test script to live.  It
> didn't seem to fit in any of the existing subdirectories, and I was
> feeling too lazy to make a name for a new one.  Suggestions?
>

Personally, I'm fine with putting it in glsl-1.10, since that's where we
put all the other tests that should be run no matter what version of GLSL
is supported.


>
>  tests/spec/glsl-1.10/compiler/invalid-version.vert | 10 ++++++++++
>  1 file changed, 10 insertions(+)
>  create mode 100644 tests/spec/glsl-1.10/compiler/invalid-version.vert
>
> diff --git a/tests/spec/glsl-1.10/compiler/invalid-version.vert
> b/tests/spec/glsl-1.10/compiler/invalid-version.vert
> new file mode 100644
> index 0000000..7dece33
> --- /dev/null
> +++ b/tests/spec/glsl-1.10/compiler/invalid-version.vert
> @@ -0,0 +1,10 @@
> +/* [config]
> + * expect_result: fail
> + * [end config]
> + */
> +#version 999
> +
> +void main()
> +{
> +    gl_Position = vec4(0.);
> +}
> --
> 1.7.11.7
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/piglit/attachments/20121130/dd9af40f/attachment-0001.html>