[Piglit] [PATCH] Fix improperly-named geometry shader tests.

[Anuj Phogat]

On Mon, Nov 11, 2013 at 2:18 PM, Paul Berry <stereotype441 at gmail.com> wrote:
> Several geometry shader tests were improperly added to all.tests with
> names like "spec/glsl-1.50/glsl-1.50-geometry-foo" instead of
> "spec/glsl-1.50/execution/geometry/foo".  This patch renames the tests
> to follow our usual piglit conventions.
> ---
>  tests/all.tests | 25 ++++++++++++++-----------
>  1 file changed, 14 insertions(+), 11 deletions(-)
>
> diff --git a/tests/all.tests b/tests/all.tests
> index af5dcf3..9df7b11 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -994,20 +994,22 @@ spec['glsl-3.30']['built-in constants'] = concurrent_test('built-in-constants te
>  # maximum number of geometry shader output vertices supported by the
>  # hardware.
>  for i in [31, 32, 33, 34, 127, 128, 129, 130, 0]:
> -    add_concurrent_test(spec['glsl-1.50'],
> -                        'glsl-1.50-geometry-end-primitive {0}'.format(i))
> +    cmdline = 'end-primitive {0}'.format(i)
> +    spec['glsl-1.50']['execution']['geometry'][cmdline] = \
> +        concurrent_test('glsl-1.50-geometry-' + cmdline)
>
>  for prim_type in ['GL_POINTS', 'GL_LINE_LOOP', 'GL_LINE_STRIP', 'GL_LINES',
>                    'GL_TRIANGLES', 'GL_TRIANGLE_STRIP', 'GL_TRIANGLE_FAN',
>                    'GL_LINES_ADJACENCY', 'GL_LINE_STRIP_ADJACENCY',
>                    'GL_TRIANGLES_ADJACENCY', 'GL_TRIANGLE_STRIP_ADJACENCY']:
> -    add_concurrent_test(spec['glsl-1.50'],
> -                        'glsl-1.50-geometry-primitive-types {0}'.format(
> -                            prim_type))
> +    cmdline = 'primitive-types {0}'.format(prim_type)
> +    spec['glsl-1.50']['execution']['geometry'][cmdline] = \
> +        concurrent_test('glsl-1.50-geometry-' + cmdline)
>      for restart_index in ['ffs', 'other']:
> -        add_concurrent_test(spec['glsl-1.50'],
> -                            'glsl-1.50-geometry-primitive-id-restart {0} {1}'.format(
> -                                prim_type, restart_index))
> +        cmdline = 'primitive-id-restart {0} {1}'.format(
> +            prim_type, restart_index)
> +        spec['glsl-1.50']['execution']['geometry'][cmdline] = \
> +            concurrent_test('glsl-1.50-geometry-' + cmdline)
>
>  for layout_type in ['points', 'lines', 'lines_adjacency', 'triangles',
>                         'triangles_adjacency']:
> @@ -1017,9 +1019,10 @@ for layout_type in ['points', 'lines', 'lines_adjacency', 'triangles',
>
>  for prim_type in ['GL_TRIANGLE_STRIP', 'GL_TRIANGLE_STRIP_ADJACENCY']:
>      for restart_index in ['ffs', 'other']:
> -        add_concurrent_test(spec['glsl-1.50'],
> -                            'glsl-1.50-geometry-tri-strip-ordering-with-prim-restart {0} {1}'.format(
> -                                prim_type, restart_index))
> +        cmdline = 'tri-strip-ordering-with-prim-restart {0} {1}'.format(
> +            prim_type, restart_index)
> +        spec['glsl-1.50']['execution']['geometry'][cmdline] = \
> +            concurrent_test('glsl-1.50-geometry-' + cmdline)
>
>  for input_layout in ['points', 'lines', 'lines_adjacency', 'triangles',
>                         'triangles_adjacency', 'line_strip', 'triangle_strip']:
> --
> 1.8.4.2
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/piglit

Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>