[Piglit] [PATCH] r300.py & r500.py: Fix regression in a840dea29a033b8d21

[Ilia Mirkin]

On Wed, Dec 31, 2014 at 8:46 PM, Dylan Baker <baker.dylan.c at gmail.com> wrote:
> The above commit changed r300.py and r500.py to no longer import
> quick.profile and modify that, but instead made them create a new
> profile with a single test. This is a major change in functionality,
> that appears to be unintentional.
>
> cc: laura at jlekstrand.net
> cc: marek.olsak at amd.com
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>
> Alternatively, these profiles have been broken for some time, is it
> worth keeping them? Marek?
>
>  tests/r300.py |  9 ++-------
>  tests/r500.py | 13 ++++---------
>  2 files changed, 6 insertions(+), 16 deletions(-)
>
> diff --git a/tests/r300.py b/tests/r300.py
> index 7cb2a63..6731292 100644
> --- a/tests/r300.py
> +++ b/tests/r300.py
> @@ -2,18 +2,13 @@
>  # Testing the r300 DRI driver
>  #
>
> -from framework.profile import TestProfile
> -from framework.test import PiglitGLTest
> +from tests.quick import profile
>
>  __all__ = ['profile']
>
> -profile = TestProfile()
> -
> -profile.tests['spec/!OpenGL 1.0/gl-1.0-blend-func'] = \
> -        PiglitGLTest('gl-1.0-blend-func', run_concurrent=True)
> -env = profile.tests['spec/!OpenGL 1.0/gl-1.0-blend-func'].env
>  #   R300 blending hardware appears to be bad
>  # Note that a setting of 1 bit is a special
>  # case in Piglit that explicitly sets tolerance = 1.0f.
> +env = profile.tests['spec']['!OpenGL 1.0']['gl-1.0-blend-func'].env
>  env['PIGLIT_BLEND_RGB_TOLERANCE'] = '2' # bits
>  env['PIGLIT_BLEND_ALPHA_TOLERANCE'] = '2' # bits
> diff --git a/tests/r500.py b/tests/r500.py
> index 5476977..9f8ecc6 100644
> --- a/tests/r500.py
> +++ b/tests/r500.py
> @@ -2,18 +2,13 @@
>  # Testing the r500 DRI driver
>  #
>
> -from framework.profile import TestProfile
> -from framework.test import PiglitGLTest
> +from tests.quick import profile
>
>  __all__ = ['profile']
>
> -profile = TestProfile()
> -
> -profile.tests['spec/!OpenGL 1.0/gl-1.0-blend-func'] = \
> -        PiglitGLTest('gl-1.0-blend-func', run_concurrent=True)
> -env = profile.tests['spec/!OpenGL 1.0/gl-1.0-blend-func'].env
>  #   R500 blending hardware appears to be a bit better than R300
>  # Note that a setting of 1 bit is a special
>  # case in Piglit that explicitly sets tolerance = 1.0f.
> -env['PIGLIT_BLEND_RGB_TOLERANCE'] = '1' #bits
> -env['PIGLIT_BLEND_ALPHA_TOLERANCE'] = '1' #bits
> +env = profile.tests['spec']['!OpenGL 1.0']['gl-1.0-blend-func'].env
> +env['PIGLIT_BLEND_RGB_TOLERANCE'] = '2' # bits
> +env['PIGLIT_BLEND_ALPHA_TOLERANCE'] = '2' # bits

oops? (should be '1' based on the old values?)