[Piglit] [PATCH 2/2] framework: Don't try to parse GL/GLSL version from wflinfo.

[Emil Velikov]

On 8 December 2015 at 00:40, Dylan Baker <baker.dylan.c at gmail.com> wrote:
> On Mon, Dec 07, 2015 at 02:26:00PM +0000, Jose Fonseca wrote:
>> It's making many assumptions about the wflinfo which are not true.
>>
>> So completely disable it as a workaround.
>>
>> Though I wonder if there's really any merit in adding a depending on
>> wflinfo.  IMO, if piglit cares for the advertised GL/GLSL versions, it
>> should have its own internally utility program to dump every thing needed.
>> Parsing output from external utilities is begging for trouble.
>> ---
>>  framework/test/opengl.py | 5 +++++
>>  1 file changed, 5 insertions(+)
>>
>> diff --git a/framework/test/opengl.py b/framework/test/opengl.py
>> index 29da2d1..0a7b2d7 100644
>> --- a/framework/test/opengl.py
>> +++ b/framework/test/opengl.py
>> @@ -80,6 +80,11 @@ class WflInfo(object):
>>          opts -- arguments to pass to wflinfo other than verbose and platform
>>
>>          """
>> +
>> +        # FIXME: The version parsing below is full of bugs.  Disable all
>> +        # wflinfo invocation until they are addressed
>> +        raise StopWflinfo('OSError')
>> +
>>          with open(os.devnull, 'w') as d:
>>              try:
>>                  raw = subprocess.check_output(
>> --
>> 2.5.0
>>
>> _______________________________________________
>> Piglit mailing list
>> Piglit at lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/piglit
>
> There is bug in wflinfo about this. Wflinfo doesn't handle the optional
> patch level at all, and returns an error when it is encountered.
>
> I've opened a bug against this:
> https://github.com/waffle-gl/waffle/issues/36
>
Afaics wflinfo simply ignores the patch version and returns an error
on glGetError() != NO_ERROR or when the version string is NULL. In the
other direction (context creation) one cannot specify a patch version
so waffle has nothing to do in that regard.

Am I missing something ?

Cheers
Emil