Re: [Piglit] [PATCH] Fix a couple EXT_blend_func_extended test bugs exposed by the Nvidia blob.

On Wed, 2016-01-27 at 18:47 -0500, Ilia Mirkin wrote: > Reviwed-by: Ilia Mirkin > > Will push this shortly. > > On Wed, Jan 27, 2016 at 1:46 PM, Ryan Houdek > wrote: > > fbo-extended-blend-pattern was using an implicit integer to float > >

[Piglit] [PATCH 00/44] Port framework to run on both python 2.7 and 3.3+

From: Dylan Baker This rather lengthy series incrementally ports the framework from running only on python 2.7 to running on python 2.7 and 3.3+ (3.2 might already work, but I haven't tested it. If there is interest in 3.2 support I'd rather worry about that after

[Piglit] [PATCH 14/44] python: use six.{iter, view}{items, keys, values}

From: Dylan Baker This was initially generated via the following sed command: sed -i \ -e 's@in \(.*\)\.iter\(values,keys,items\)()@in six.iter\2(\1)@g' \ -e 's@in \(.*\..*\)\.iter\(values,keys,items\)()@in six.iter\2(\1)@g' Then cleaned up by hand, including

[Piglit] [PATCH 25/44] unittest/utils.py: fix tempfile modes for python3

From: Dylan Baker By default in python 3 write modes for tempfile are bytes, but piglit uses unicode. This fixes that. Signed-off-by: Dylan Baker --- unittests/utils.py | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git

[Piglit] [PATCH 35/44] framework/core.py: make collect_system_info return unicode

From: Dylan Baker This changes collect_system_info to convert the raw output of each command to unicode before returning it. Signed-off-by: Dylan Baker --- framework/core.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff

[Piglit] [PATCH 41/44] summary/html: fix python 3 encoding issues.

From: Dylan Baker In python 3 the current implementation provides bytes instead of unicode, but the write mode is set for unicode. Signed-off-by: Dylan Baker --- framework/summary/html_.py | 2 -- 1 file changed, 2 deletions(-) diff --git

[Piglit] [PATCH 44/44] tox.ini: add python 3.3-3.5 for standard tests.

From: Dylan Baker This refactors the tox.ini a little bit since some of the requirements of the accel platform on 2.7 (backports.lzma and subprocess32) are not required in 3.3+, and mock is not required on 3.3+ for any profile. Signed-off-by: Dylan Baker

[Piglit] [PATCH 36/44] framework/test/glsl_parser_test.py: stop supporting bytes

From: Dylan Baker This makes the GLSLParserTest class only support str (unicode in python 2), and not bytes (str in python 2). Signed-off-by: Dylan Baker --- framework/test/glsl_parser_test.py | 27 +++

[Piglit] [PATCH 10/44] framework: use six.add_metaclass

From: Dylan Baker This makes metaclasses work on both python 3 and python 2, which have a different syntax for setting the metaclass of a class. Signed-off-by: Dylan Baker --- framework/backends/abstract.py | 5 +++-- framework/dmesg.py

[Piglit] [PATCH 39/44] options_tests.py: Fix test that happened to work on python 2

From: Dylan Baker On python 2 re.compile sets no flags, so asking if the flags bitfield == re.IGNORECASE works. For python 3 this isn't the case (the default it returns for me is 100010), so the test needs to correctly check that re.IGNORECASE is in the bitfield.

[Piglit] [PATCH 18/44] base_tests.py: make tests for timeout run on python 3.x

From: Dylan Baker These tests are always valid on python 3, but only valid on python 2 if subprocess32 is installed. One unittest on python3 raises a warning. I've tracked it back to somewhere in the python stdlib. I think that for some reason a file is being unlinked

[Piglit] [PATCH 29/44] framework/results.py: fix StringDescriptor handling of bytes

From: Dylan Baker This actually needs to handle bytes, since it gets assigned from subprocess directly. Signed-off-by: Dylan Baker --- unittests/results_tests.py | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git

[Piglit] [PATCH 31/44] framework/log.py: fix next() call

From: Dylan Baker In python 2 < 2.6, generators define a next() method. In python 2.6+ (including 2.7) they should define a __next__ method and are called with the next() function. In python 2.6 and 2.7 both are supported, but in 3.x only the __next__ method is

[Piglit] [PATCH 40/44] gen_dispatch.py: don't use tabs

From: Dylan Baker Python 3 doesn't allow mixing of tabs and spaces for indent, only a choice between one or the other. Piglit uses spaces. Signed-off-by: Dylan Baker --- tests/util/gen_dispatch.py | 2 +- 1 file changed, 1 insertion(+), 1

[Piglit] [PATCH 20/44] base_tests.py: Add tests for an exception in Test.execute

From: Dylan Baker Signed-off-by: Dylan Baker --- unittests/base_tests.py| 43 +++ unittests/results_tests.py | 5 + unittests/utils.py | 5 + 3 files changed, 53 insertions(+) diff

[Piglit] [PATCH 34/44] framework/backends/json.py: use text_type instead for str

From: Dylan Baker Signed-off-by: Dylan Baker --- framework/backends/json.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework/backends/json.py b/framework/backends/json.py index beae8f8..c4074fd 100644 ---

[Piglit] [PATCH 33/44] Framework/backends/junit.py: fix bytes/unicode handling on python3

From: Dylan Baker This changes the junit.py script to always convert bytes into unicode before writing, since we do declare that our xml is encoded in unicode. Signed-off-by: Dylan Baker --- framework/backends/junit.py | 10 ++ 1 file

[Piglit] [PATCH 23/44] opengl.py: fix bytes returned from wflinfo.

From: Dylan Baker Convert to unicode, this requires reworking the tests to ensure that they provide bytes instances in the right places, or they trip up on the decode method call, which in python 3 is only available on str (unicode), and not on bytes. Signed-off-by:

[Piglit] [PATCH 13/44] framework/results.py: use compat

From: Dylan Baker Signed-off-by: Dylan Baker --- framework/results.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/framework/results.py b/framework/results.py index d8a9f16..f0c0a99 100644 --- a/framework/results.py

[Piglit] [PATCH 32/44] log_tests.py: fix incompatible seek for python 3

From: Dylan Baker In python2 one can seek to negatives (-1 is the end of the file, for example). In python 2.6+ (and exclusively in python 3) one instead uses the second argument of seek to say whether to start at the start or end of the file, and then an exact point. So

[Piglit] [PATCH 01/44] tox.ini: drop explicit coverage generation

From: Dylan Baker Instead allow extra arguments to be passed to tox, which can be used to set the coverage options if wanted. Signed-off-by: Dylan Baker --- tox.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[Piglit] [PATCH 42/44] CMake: Enable python 3.x for building

From: Dylan Baker The generators have supported 3.x for some time, this now makes 3.x the default, and falls back to 2.7 This has been tested with 3.5 and 2.7 Signed-off-by: Dylan Baker --- CMakeLists.txt | 4 +++- 1 file changed, 3

[Piglit] [PATCH 17/44] unittests: try to import mock from unittest

From: Dylan Baker As of python 3.3 mock is included in python's stdlib. Try to import the included version, then the external package version if that fails. This patch was generated with the following sed command: sed -i -e 's@import mock@try:\nfrom unittest import

[Piglit] [PATCH 27/44] dmesg.py: Fix str/bytes/unicode for python 2/3 compatibility

From: Dylan Baker Mostly this involves marking str (unicode) and bytes explicitly and not mixing the two. Signed-off-by: Dylan Baker --- framework/dmesg.py | 3 ++- unittests/dmesg_tests.py | 19 ++- 2 files changed, 12

[Piglit] [PATCH 38/44] unittests/opengl_tests.py: stop mock leakage

From: Dylan Baker For some reason in python 3 (all versions) some of the mock patchers in this opengl test leak out into other modules. This doesn't happen in python 2. I'm not sure why this fixes the issue, but it does. Signed-off-by: Dylan Baker

[Piglit] [PATCH] xts: Fix skip handling.

Commit 23e06ffaa51b9075c1e5e0c220c991efc5609838 broke skip handling by overwriting the result after we had set it. --- tests/xts.py | 12 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/xts.py b/tests/xts.py index 6798e70..e528626 100644 --- a/tests/xts.py +++

Re: [Piglit] [PATCH] Fix a couple EXT_blend_func_extended test bugs exposed by the Nvidia blob.

Reviwed-by: Ilia Mirkin Will push this shortly. On Wed, Jan 27, 2016 at 1:46 PM, Ryan Houdek wrote: > fbo-extended-blend-pattern was using an implicit integer to float conversion > which isn't allowed in ESSL. > > builtins program linker error

[Piglit] [PATCH 24/44] compression.py: use the proper read and write modes for python versions

From: Dylan Baker In python 2 the write mode should be 'w', and the read 'r', but in python 3 they need to be 'wt', and 'rt' respectively. Python 3 also has an lzma module built in, which vastly simplifies supporting xz. Signed-off-by: Dylan Baker

[Piglit] [PATCH 22/44] framework, unittests: use __future__ unicode_literals

From: Dylan Baker Use unicode_literals from __future__. This makes undecorated strings (those not using and b or u prefix) into unicode instead of bytes in python 2. This means that bytes strings need to have a b prefix now. This also fixes a couple of unittests that

[Piglit] [PATCH 12/44] framework/compat.py: Add a small module with some extra compat

From: Dylan Baker All of these changes are submitted to upstream six, and are ontrack for landing. Signed-off-by: Dylan Baker --- framework/compat.py | 41 + 1 file changed, 41 insertions(+) create

[Piglit] [PATCH 16/44] framework/programs/run.py: use PIGLIT_CONFIG.safe_get

From: Dylan Baker This implements the same behavior, but with a fallback parameter. Signed-off-by: Dylan Baker --- framework/programs/run.py | 31 --- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git

[Piglit] [PATCH 11/44] python: use six unicode/bytes/str handling

From: Dylan Baker This is not feature complete for python 3.x in and of itself, but it gets started by using six functions rather than str and unicode. Signed-off-by: Dylan Baker --- framework/backends/compression.py | 8 +---

[Piglit] [PATCH 26/44] framework/status.py: Add __hash__ method to NoChangeStatus

From: Dylan Baker Apparently these aren't inherited in python 3, which makes sense. Signed-off-by: Dylan Baker --- framework/status.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/framework/status.py b/framework/status.py index

[Piglit] [PATCH 06/44] unittests: use six.moves.getcwd

From: Dylan Baker Signed-off-by: Dylan Baker --- unittests/core_tests.py | 7 --- unittests/summary_html_tests.py | 3 ++- unittests/utils.py | 3 ++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git

[Piglit] [PATCH 19/44] framework/test/base.py: Make timeout work in python 3.x

From: Dylan Baker This wraps the subprocess32/not subprocess32 in a six.PY2 block, and for python 3.x just imports subprocess and sets _EXTRA_ARGS appropriately. For MS Windows the timeout is disabled. This could be fixed, but I don't have any interest in getting it

[Piglit] [PATCH 09/44] framework/test/base.py: fix class/__slots__ conflict in python3

From: Dylan Baker Signed-off-by: Dylan Baker --- framework/test/base.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/framework/test/base.py b/framework/test/base.py index 43f81c4..0c15808 100644 ---

[Piglit] [PATCH 30/44] framework/test/base.py: fix compare to None in python 3

From: Dylan Baker Also fix unittest that relied on compare to None having python 2 behavior. Signed-off-by: Dylan Baker --- framework/test/base.py| 5 + unittests/oglconform_tests.py | 1 + 2 files changed, 6 insertions(+) diff

[Piglit] [PATCH 08/44] python: use six.moves.cStringIO

From: Dylan Baker This is the fast C based version on python 2, and is adapative on python3, importing the C based version if it's available and falling back if necessary. Signed-off-by: Dylan Baker --- framework/backends/compression.py | 10

[Piglit] [PATCH 04/44] framework: use six.moves.configparser

From: Dylan Baker This module is a compatibility shim for python 3.x and 2.x Signed-off-by: Dylan Baker --- framework/core.py | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/framework/core.py

[Piglit] [PATCH 28/44] status_tests.py: drop bytes tests, status doesn't support bytes anymore

From: Dylan Baker Signed-off-by: Dylan Baker --- unittests/status_tests.py | 7 +++ 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/unittests/status_tests.py b/unittests/status_tests.py index b76d5b5..00f00e8 100644 ---

[Piglit] [PATCH 03/44] python: use six.moves.range

From: Dylan Baker This is xrange on python 2.x and range on 3.x Signed-off-by: Dylan Baker --- framework/test/base.py| 4 +++- tests/all.py | 4 +++- unittests/summary_common_tests.py | 3 ++- 3 files changed,

[Piglit] [PATCH 15/44] framework/profile.py: replace dictionary-comprehension with dict()

From: Dylan Baker There wasn't ever a need to use a comprehension here, this is simpler and easier to read and maintain. It might even be faster. Signed-off-by: Dylan Baker --- framework/profile.py | 4 ++-- 1 file changed, 2 insertions(+), 2

[Piglit] [PATCH 02/44] python: use future print, division, and absolute_import

From: Dylan Baker These are the three python3 like behaviors that piglit should rely on. The only other applicable future import is unicode_literals. Although my plan is to use unicode_literals, that will actually cause behavioral changes in some cases, where these cause

[Piglit] [PATCH 05/44] framework: use six.moves.BaseHTTPServer shim

From: Dylan Baker Signed-off-by: Dylan Baker --- framework/log.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/framework/log.py b/framework/log.py index 5bd6902..704ab05 100644 --- a/framework/log.py +++

[Piglit] [Bug 93856] piglit summary aggregate problem

https://bugs.freedesktop.org/show_bug.cgi?id=93856 --- Comment #1 from Dylan --- Hmmm, I can't replicate this myself (I'm testing with dEQP and piglit opengl, because I don't really want to have to reboot my system when igt hoses it). You are running an older version of

Re: [Piglit] [PATCH 1/1] cl: Don't warn when using deprecated functions.

On Fri, Jan 15, 2016 at 05:38:43PM -0500, Jan Vesely wrote: > Deprecated features are required to be supported until they are removed. > > Signed-off-by: Jan Vesely Reviewed-by: Tom Stellard > --- > tests/cl/api/get-image-info.c | 14

Re: [Piglit] [PATCH 1/1] cl: Add scalar to constant load test

On Fri, Jan 15, 2016 at 05:37:42PM -0500, Jan Vesely wrote: > Signed-off-by: Jan Vesely Reviewed-by: Tom Stellard > --- > tests/cl/program/execute/constant-load.cl | 18 ++ > 1 file changed, 14 insertions(+), 4 deletions(-) > >

Re: [Piglit] [PATCH RESEND 1/1] cl: Extend program scope arrays with more types

On Fri, Jan 15, 2016 at 05:41:08PM -0500, Jan Vesely wrote: > Signed-off-by: Jan Vesely > --- > > This used to trigger failure when LLVM put different types in different > .rodata sections. Now there are no .rodata sections for radeon, but I think > we should still test