[Piglit] [PATCH] tests: Update integration for khronos CTS runner.

[Marek Olšák]

Reviewed-by: Marek Olšák <marek.olsak at amd.com>

Marek

On Mon, May 15, 2017 at 5:13 PM, Andres Gomez <agomez at igalia.com> wrote:
> After:
> https://github.com/KhronosGroup/VK-GL-CTS/commit/af8c22a343ee2c230488f6de71b36dc3070b2024
>
> OpenGL GL*-CTS case lists have been renamed to KHR-GL*.
>
> Signed-off-by: Andres Gomez <agomez at igalia.com>
> ---
>  tests/cts_gl.py   | 20 ++++++++++----------
>  tests/cts_gl45.py |  2 +-
>  2 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/tests/cts_gl.py b/tests/cts_gl.py
> index d650ffd4b..a40b0b369 100644
> --- a/tests/cts_gl.py
> +++ b/tests/cts_gl.py
> @@ -69,24 +69,24 @@ class DEQPCTSTest(deqp.DEQPBaseTest):
>  profile = deqp.make_profile(  # pylint: disable=invalid-name
>      itertools.chain(
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL30-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL30-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL31-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL31-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL32-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL32-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL33-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL33-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL40-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL40-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL41-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL41-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL42-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL42-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL43-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL43-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL44-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL44-cases.txt', _EXTRA_ARGS)),
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL45-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL45-cases.txt', _EXTRA_ARGS)),
>      ),
>      DEQPCTSTest)
> diff --git a/tests/cts_gl45.py b/tests/cts_gl45.py
> index 2782e18f4..580c8760a 100644
> --- a/tests/cts_gl45.py
> +++ b/tests/cts_gl45.py
> @@ -63,6 +63,6 @@ class DEQPCTSTest(deqp.DEQPBaseTest):
>  profile = deqp.make_profile(  # pylint: disable=invalid-name
>      itertools.chain(
>          deqp.iter_deqp_test_cases(
> -            deqp.gen_caselist_txt(_CTS_BIN, 'GL45-CTS-cases.txt', _EXTRA_ARGS)),
> +            deqp.gen_caselist_txt(_CTS_BIN, 'KHR-GL45-cases.txt', _EXTRA_ARGS)),
>      ),
>      DEQPCTSTest)
> --
> 2.11.0
>
> _______________________________________________
> Piglit mailing list
> Piglit at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/piglit