[Piglit] [PATCH 2/2] framework: Don't try to parse GL/GLSL version from wflinfo.
Jose Fonseca
jfonseca at vmware.com
Tue Dec 8 05:08:35 PST 2015
On 08/12/15 00:40, Dylan Baker 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
FWIW, this is very different from what I saw.
As I mentioned on another email on this thread, what I see is:
$ wflinfo --platform glx --api gl --profile core
Waffle platform: glx
Waffle api: gl
OpenGL vendor string: NVIDIA Corporation
OpenGL renderer string: Quadro K1000M/PCIe/SSE2
OpenGL version string: 4.4.0 NVIDIA 355.11
OpenGL context flags: 0x0
That is, Ubuntu 15.10's wflinfo is dumping the "OpenGL version string"
*as-is*, ie, without any processing.
I don't know what was expected out of wflinfo, but I still think it's a
mistake to rely on it. Especially now the cat is out of the bag.
Jose
More information about the Piglit
mailing list