[Piglit] [PATCH v3 6/8] tests/all.py: Don't add glsl-1.50 TextureSize tests twice

[Ilia Mirkin]

Ugh, this is because textureSize_samplers_140 =
textureSize_samplers_130 + [...]? FWIW the arguments are different,
but I don't know if the test is any different (the 140 version passes
in an extra '140' argument). May be worth investigating if they're
both worth keeping or not.

On Fri, Mar 20, 2015 at 2:51 PM, Dylan Baker <baker.dylan.c at gmail.com> wrote:
> Because gs is a 1.50 features, but is added in the 1.30 and 1.40 loops
> it currently adds the same tests twice. This corrects that.
>
> Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
> ---
>  tests/all.py | 16 +++++++++++-----
>  1 file changed, 11 insertions(+), 5 deletions(-)
>
> diff --git a/tests/all.py b/tests/all.py
> index 3871f05..e25dcbe 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -1359,12 +1359,17 @@ for stage in ['vs', 'gs', 'fs']:
>          version = '1.50'
>      else:
>          version = '1.30'
> +
>      # textureSize():
> -    for sampler in textureSize_samplers_130:
> -        profile.test_list[grouptools.join(
> -            'spec', 'glsl-{}'.format(version), 'execution', 'textureSize',
> -            '{}-textureSize-{}'.format(stage, sampler))] = PiglitGLTest(
> -                ['textureSize', stage, sampler])
> +    # These will be added in the textureSize_samplers_140 loop for gs, because
> +    # it is a special case and is actually 1.50 feature.
> +    if stage is not 'gs':
> +        for sampler in textureSize_samplers_130:
> +            profile.test_list[grouptools.join(
> +                'spec', 'glsl-{}'.format(version), 'execution', 'textureSize',
> +                '{}-textureSize-{}'.format(stage, sampler))] = PiglitGLTest(
> +                    ['textureSize', stage, sampler])
> +
>      # texelFetch():
>      for sampler in ['sampler1D', 'sampler2D', 'sampler3D', 'sampler1DArray',
>                      'sampler2DArray', 'isampler1D', 'isampler2D', 'isampler3D',
> @@ -1379,6 +1384,7 @@ for stage in ['vs', 'gs', 'fs']:
>              'spec', 'glsl-{}'.format(version), 'execution', 'texelFetchOffset',
>              '{}-texelFetch-{}'.format(stage, sampler))] = PiglitGLTest(
>                  ['texelFetch', 'offset', stage, sampler])
> +
>      # texelFetch() with EXT_texture_swizzle mode "b0r1":
>      for type in ['i', 'u', '']:
>          profile.test_list[grouptools.join(
> --
> 2.3.3
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit