[Piglit] [PATCH 1/5] gl-1.0: Move scissor tests here.

[Brian Paul]

Series LGTM.  Thanks.

Reviewed-by: Brian Paul <brianp at vmware.com>


On 09/01/2016 12:44 PM, Matt Turner wrote:
> ---
>   tests/all.py                                           | 16 ++++++++--------
>   tests/general/CMakeLists.gl.txt                        |  8 --------
>   tests/spec/gl-1.0/CMakeLists.gl.txt                    |  8 ++++++++
>   tests/{general => spec/gl-1.0}/scissor-bitmap.c        |  0
>   tests/{general => spec/gl-1.0}/scissor-clear.c         |  0
>   tests/{general => spec/gl-1.0}/scissor-copypixels.c    |  0
>   tests/{general => spec/gl-1.0}/scissor-depth-clear.c   |  0
>   tests/{general => spec/gl-1.0}/scissor-many.c          |  0
>   tests/{general => spec/gl-1.0}/scissor-offscreen.c     |  0
>   tests/{general => spec/gl-1.0}/scissor-polygon.c       |  0
>   tests/{general => spec/gl-1.0}/scissor-stencil-clear.c |  0
>   11 files changed, 16 insertions(+), 16 deletions(-)
>   rename tests/{general => spec/gl-1.0}/scissor-bitmap.c (100%)
>   rename tests/{general => spec/gl-1.0}/scissor-clear.c (100%)
>   rename tests/{general => spec/gl-1.0}/scissor-copypixels.c (100%)
>   rename tests/{general => spec/gl-1.0}/scissor-depth-clear.c (100%)
>   rename tests/{general => spec/gl-1.0}/scissor-many.c (100%)
>   rename tests/{general => spec/gl-1.0}/scissor-offscreen.c (100%)
>   rename tests/{general => spec/gl-1.0}/scissor-polygon.c (100%)
>   rename tests/{general => spec/gl-1.0}/scissor-stencil-clear.c (100%)
>
> diff --git a/tests/all.py b/tests/all.py
> index e110f59..276f5a8 100644
> --- a/tests/all.py
> +++ b/tests/all.py
> @@ -859,14 +859,6 @@ with profile.group_manager(
>       g(['readpix-z'])
>       g(['roundmode-getintegerv'], run_concurrent=False)
>       g(['roundmode-pixelstore'], run_concurrent=False)
> -    g(['scissor-bitmap'], run_concurrent=False)
> -    g(['scissor-clear'], run_concurrent=False)
> -    g(['scissor-copypixels'], run_concurrent=False)
> -    g(['scissor-depth-clear'], run_concurrent=False)
> -    g(['scissor-many'], run_concurrent=False)
> -    g(['scissor-offscreen'], run_concurrent=False)
> -    g(['scissor-polygon'])
> -    g(['scissor-stencil-clear'], run_concurrent=False)
>       g(['select', 'gl11'], 'GL_SELECT - no test function', run_concurrent=False)
>       g(['select', 'depth'], 'GL_SELECT - depth-test enabled',
>         run_concurrent=False)
> @@ -971,6 +963,14 @@ with profile.group_manager(
>       g(['gl-1.0-logicop'])
>       g(['gl-1.0-no-op-paths'])
>       g(['gl-1.0-simple-readbuffer'])
> +    g(['gl-1.0-scissor-bitmap'], run_concurrent=False)
> +    g(['gl-1.0-scissor-clear'], run_concurrent=False)
> +    g(['gl-1.0-scissor-copypixels'], run_concurrent=False)
> +    g(['gl-1.0-scissor-depth-clear'], run_concurrent=False)
> +    g(['gl-1.0-scissor-many'], run_concurrent=False)
> +    g(['gl-1.0-scissor-offscreen'], run_concurrent=False)
> +    g(['gl-1.0-scissor-polygon'])
> +    g(['gl-1.0-scissor-stencil-clear'], run_concurrent=False)
>
>   with profile.group_manager(
>           PiglitGLTest,
> diff --git a/tests/general/CMakeLists.gl.txt b/tests/general/CMakeLists.gl.txt
> index 3a46fb0..ceec9f0 100644
> --- a/tests/general/CMakeLists.gl.txt
> +++ b/tests/general/CMakeLists.gl.txt
> @@ -99,14 +99,6 @@ piglit_add_executable (read-front read-front.c)
>   piglit_add_executable (readpix-z readpix-z.c)
>   piglit_add_executable (roundmode-getintegerv roundmode-getintegerv.c)
>   piglit_add_executable (roundmode-pixelstore roundmode-pixelstore.c)
> -piglit_add_executable (scissor-bitmap scissor-bitmap.c)
> -piglit_add_executable (scissor-clear scissor-clear.c)
> -piglit_add_executable (scissor-copypixels scissor-copypixels.c)
> -piglit_add_executable (scissor-depth-clear scissor-depth-clear.c)
> -piglit_add_executable (scissor-many scissor-many.c)
> -piglit_add_executable (scissor-offscreen scissor-offscreen.c)
> -piglit_add_executable (scissor-polygon scissor-polygon.c)
> -piglit_add_executable (scissor-stencil-clear scissor-stencil-clear.c)
>   piglit_add_executable (select select.c)
>   piglit_add_executable (stencil-drawpixels stencil-drawpixels.c)
>   piglit_add_executable (stencil-twoside stencil-twoside.c)
> diff --git a/tests/spec/gl-1.0/CMakeLists.gl.txt b/tests/spec/gl-1.0/CMakeLists.gl.txt
> index 219b9b1..e79f0cb 100644
> --- a/tests/spec/gl-1.0/CMakeLists.gl.txt
> +++ b/tests/spec/gl-1.0/CMakeLists.gl.txt
> @@ -29,6 +29,14 @@ piglit_add_executable (gl-1.0-rastercolor rastercolor.c)
>   piglit_add_executable (gl-1.0-readpixsanity readpix.c)
>   piglit_add_executable (gl-1.0-readpixels-oob readpixels-oob.c)
>   piglit_add_executable (gl-1.0-rendermode-feedback rendermode-feedback.c)
> +piglit_add_executable (gl-1.0-scissor-bitmap scissor-bitmap.c)
> +piglit_add_executable (gl-1.0-scissor-clear scissor-clear.c)
> +piglit_add_executable (gl-1.0-scissor-copypixels scissor-copypixels.c)
> +piglit_add_executable (gl-1.0-scissor-depth-clear scissor-depth-clear.c)
> +piglit_add_executable (gl-1.0-scissor-many scissor-many.c)
> +piglit_add_executable (gl-1.0-scissor-offscreen scissor-offscreen.c)
> +piglit_add_executable (gl-1.0-scissor-polygon scissor-polygon.c)
> +piglit_add_executable (gl-1.0-scissor-stencil-clear scissor-stencil-clear.c)
>   piglit_add_executable (gl-1.0-simple-readbuffer simple-readbuffer.c)
>   piglit_add_executable (gl-1.0-swapbuffers-behavior swapbuffers-behavior.c)
>
> diff --git a/tests/general/scissor-bitmap.c b/tests/spec/gl-1.0/scissor-bitmap.c
> similarity index 100%
> rename from tests/general/scissor-bitmap.c
> rename to tests/spec/gl-1.0/scissor-bitmap.c
> diff --git a/tests/general/scissor-clear.c b/tests/spec/gl-1.0/scissor-clear.c
> similarity index 100%
> rename from tests/general/scissor-clear.c
> rename to tests/spec/gl-1.0/scissor-clear.c
> diff --git a/tests/general/scissor-copypixels.c b/tests/spec/gl-1.0/scissor-copypixels.c
> similarity index 100%
> rename from tests/general/scissor-copypixels.c
> rename to tests/spec/gl-1.0/scissor-copypixels.c
> diff --git a/tests/general/scissor-depth-clear.c b/tests/spec/gl-1.0/scissor-depth-clear.c
> similarity index 100%
> rename from tests/general/scissor-depth-clear.c
> rename to tests/spec/gl-1.0/scissor-depth-clear.c
> diff --git a/tests/general/scissor-many.c b/tests/spec/gl-1.0/scissor-many.c
> similarity index 100%
> rename from tests/general/scissor-many.c
> rename to tests/spec/gl-1.0/scissor-many.c
> diff --git a/tests/general/scissor-offscreen.c b/tests/spec/gl-1.0/scissor-offscreen.c
> similarity index 100%
> rename from tests/general/scissor-offscreen.c
> rename to tests/spec/gl-1.0/scissor-offscreen.c
> diff --git a/tests/general/scissor-polygon.c b/tests/spec/gl-1.0/scissor-polygon.c
> similarity index 100%
> rename from tests/general/scissor-polygon.c
> rename to tests/spec/gl-1.0/scissor-polygon.c
> diff --git a/tests/general/scissor-stencil-clear.c b/tests/spec/gl-1.0/scissor-stencil-clear.c
> similarity index 100%
> rename from tests/general/scissor-stencil-clear.c
> rename to tests/spec/gl-1.0/scissor-stencil-clear.c
>