[Piglit] [PATCH] arb_direct_state_access: fix the execution of two tests

Ilia Mirkin imirkin at alum.mit.edu
Mon Mar 2 02:44:24 PST 2015


On Mon, Mar 2, 2015 at 5:33 AM, Martin Peres
<martin.peres at linux.intel.com> wrote:
> The problem was in all.py where the argument was not specified as an array
> but rather in the same string as the binary's path.
>
> Problem spotted by Laura Ekstrand.
>
> Signed-off-by: Martin Peres <martin.peres at linux.intel.com>
> ---
>  framework/test/base.py | 2 +-
>  tests/all.py           | 4 ++--
>  2 files changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/framework/test/base.py b/framework/test/base.py
> index efc20cb..49d5eff 100644
> --- a/framework/test/base.py
> +++ b/framework/test/base.py
> @@ -310,7 +310,7 @@ class Test(object):
>              # failed.
>              if e.errno == errno.ENOENT:
>                  self.result['result'] = 'skip'
> -                out = "Test executable not found.\n"
> +                out = "Test executable '%s' not found: %s\n" % (e.filename, e.strerror)

Is the strerror really useful here? Seems like it would just be "File
not found", which is already in the error message. The filename is a
nice addition though.

>                  err = ""
>                  returncode = None
>                  error = True
> diff --git a/tests/all.py b/tests/all.py
> index 0738de7..a2de35c 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -4008,11 +4008,11 @@ spec['ARB_direct_state_access']['copytexturesubimage'] = PiglitGLTest(['arb_dire
>  spec['ARB_direct_state_access']['texture-errors'] = PiglitGLTest(['arb_direct_state_access-texture-errors'], run_concurrent=True)
>  spec['ARB_direct_state_access']['get-textures'] = PiglitGLTest(['arb_direct_state_access-get-textures'], run_concurrent=True)
>  spec['ARB_direct_state_access']['gettextureimage-formats'] = PiglitGLTest(['arb_direct_state_access-gettextureimage-formats'], run_concurrent=True)
> -spec['ARB_direct_state_access']['gettextureimage-formats'] = PiglitGLTest(['arb_direct_state_access-gettextureimage-formats init-by-rendering'], run_concurrent=True)
> +spec['ARB_direct_state_access']['gettextureimage-formats'] = PiglitGLTest(['arb_direct_state_access-gettextureimage-formats', 'init-by-rendering'], run_concurrent=True)
>  spec['ARB_direct_state_access']['gettextureimage-luminance'] = PiglitGLTest(['arb_direct_state_access-gettextureimage-luminance'], run_concurrent=True)
>  spec['ARB_direct_state_access']['gettextureimage-simple'] = PiglitGLTest(['arb_direct_state_access-gettextureimage-simple'], run_concurrent=True)
>  spec['ARB_direct_state_access']['gettextureimage-targets'] = PiglitGLTest(['arb_direct_state_access-gettextureimage-targets'], run_concurrent=True)
> -spec['ARB_direct_state_access']['compressedtextureimage'] = PiglitGLTest(['arb_direct_state_access-compressedtextureimage GL_COMPRESSED_RGBA_FXT1_3DFX'], run_concurrent=True)
> +spec['ARB_direct_state_access']['compressedtextureimage'] = PiglitGLTest(['arb_direct_state_access-compressedtextureimage',  'GL_COMPRESSED_RGBA_FXT1_3DFX'], run_concurrent=True)

Just one space after the , . Also, only the intel driver supports
FXT1; if possible, it'd be nicer to pick a format that more drivers
support. But you can do that later.

>  spec['ARB_direct_state_access']['getcompressedtextureimage'] = PiglitGLTest(['arb_direct_state_access-getcompressedtextureimage'], run_concurrent=True)
>  spec['ARB_direct_state_access']['texture-storage-multisample'] = PiglitGLTest(['arb_direct_state_access-texture-storage-multisample'], run_concurrent=True)
>  spec['ARB_direct_state_access']['texture-buffer'] = PiglitGLTest(['arb_direct_state_access-texture-buffer'], run_concurrent=True)
> --
> 2.3.1
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit


More information about the Piglit mailing list