[Piglit] [PATCH 2/6] Replace some C code GLSL linker tests with glsl-link-test

[Chad Versace]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 10/28/2011 03:26 PM, Ian Romanick wrote:
> From: Ian Romanick <ian.d.romanick at intel.com>
> 
> Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
> ---
>  tests/all.tests                          |   18 +++---
>  tests/shaders/CMakeLists.gl.txt          |    5 --
>  tests/shaders/glsl-link-initializer-01.c |   82 ------------------------------
>  tests/shaders/glsl-link-initializer-02.c |   78 ----------------------------
>  tests/shaders/glsl-link-initializer-04.c |   71 --------------------------
>  tests/shaders/glsl-link-initializer-05.c |   71 --------------------------
>  tests/shaders/glsl-link-initializer-06.c |   76 ---------------------------

The source files should be deleted for glsl-link-{invariant-01,centroid-01,struct-array}.

>  7 files changed, 9 insertions(+), 392 deletions(-)
>  delete mode 100644 tests/shaders/glsl-link-initializer-01.c
>  delete mode 100644 tests/shaders/glsl-link-initializer-02.c
>  delete mode 100644 tests/shaders/glsl-link-initializer-04.c
>  delete mode 100644 tests/shaders/glsl-link-initializer-05.c
>  delete mode 100644 tests/shaders/glsl-link-initializer-06.c
> 
> diff --git a/tests/all.tests b/tests/all.tests
> index ce701b8..8f50306 100644
> --- a/tests/all.tests
> +++ b/tests/all.tests
> @@ -465,15 +465,15 @@ add_plain_test(shaders, 'glsl-link-bug30552')
>  add_plain_test(shaders, 'glsl-link-bug38015')
>  add_plain_test(shaders, 'glsl-link-empty-prog-01')
>  add_plain_test(shaders, 'glsl-link-empty-prog-02')
> -add_plain_test(shaders, 'glsl-link-initializer-01')
> -add_plain_test(shaders, 'glsl-link-initializer-02')
> -add_plain_test(shaders, 'glsl-link-initializer-03')
> -add_plain_test(shaders, 'glsl-link-initializer-04')
> -add_plain_test(shaders, 'glsl-link-initializer-05')
> -add_plain_test(shaders, 'glsl-link-initializer-06')
> -add_plain_test(shaders, 'glsl-link-invariant-01')
> -add_plain_test(shaders, 'glsl-link-centroid-01')
> -add_plain_test(shaders, 'glsl-link-struct-array')
> +shaders['GLSL link mismatched global initializer, 3 shaders'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-01a.vert shaders/glsl-link-initializer-01b.vert shaders/glsl-link-initializer-01c.vert fail')
> +shaders['GLSL link mismatched global const initializer'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-02a.vert shaders/glsl-link-initializer-02b.vert fail')
> +shaders['GLSL link matched global initializer'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-04a.vert shaders/glsl-link-initializer-04b.vert pass')
> +shaders['GLSL link two programs, global initializer'] = concurrent_test('glsl-link-initializer-03')

Tests 3 and 4 are out of order.

> +shaders['GLSL link matched global initializer expression'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-05a.vert shaders/glsl-link-initializer-05b.vert pass')
> +shaders['GLSL link mismatched global initializer expression'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-06a.vert shaders/glsl-link-initializer-06b.vert fail')
> +shaders['GLSL link mismatched invariant'] = concurrent_test('glsl-link-test shaders/glsl-link-invariant-01a.vert shaders/glsl-link-invariant-01b.vert fail')
> +shaders['GLSL link mismatched centroid'] = concurrent_test('glsl-link-test shaders/glsl-link-centroid-01a.vert shaders/glsl-link-centroid-01b.vert fail')
> +shaders['GLSL link array-of-struct-of-array'] = concurrent_test('glsl-link-test shaders/glsl-link-struct-array.frag pass'
>  add_plain_test(shaders, 'glsl-max-vertex-attrib')
>  add_plain_test(shaders, 'glsl-kwin-blur-1')
>  add_plain_test(shaders, 'glsl-kwin-blur-2')
> diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
> index 1bf73e8..d115dea 100644
> --- a/tests/shaders/CMakeLists.gl.txt
> +++ b/tests/shaders/CMakeLists.gl.txt
> @@ -117,12 +117,7 @@ add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
>  add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
>  add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
>  add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
> -add_executable (glsl-link-initializer-01 glsl-link-initializer-01.c)
> -add_executable (glsl-link-initializer-02 glsl-link-initializer-02.c)
>  add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
> -add_executable (glsl-link-initializer-04 glsl-link-initializer-04.c)
> -add_executable (glsl-link-initializer-05 glsl-link-initializer-05.c)
> -add_executable (glsl-link-initializer-06 glsl-link-initializer-06.c)
>  add_executable (glsl-link-invariant-01 glsl-link-invariant-01.c)
>  add_executable (glsl-link-centroid-01 glsl-link-centroid-01.c)
>  add_executable (glsl-link-struct-array glsl-link-struct-array.c)

As above, the build rules should be deleted for  glsl-link-{invariant-01,centroid-01,struct-array}.


Could you comment in the commit message why you did not convert glsl-link-initializer-03?
I had to do some probing to discover the reason.

- -- 
Chad Versace
chad at chad-versace.us
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iQIcBAEBAgAGBQJOrusiAAoJEAIvNt057x8idf0QAJDFB3Tjz+tKmUDBfhs01W2G
yMaHUSJ0okQEWhYoMQUCAXR4m70O2V+2ZP4M9YnAnMQhI9tzB9PCx0jyxOtjICRg
2hrXV5+khU8Fen+ZFNC4EZ852mxU6BpJuxxxT1iP5fRwK6QyMsgMH92YSaIRyRjq
g9u2UJc1pxNg1QqdDuSA8TpbeHkPD22SqKCk20BsEs/k1jGPq6X4mRbYui+brxlg
XYHUnfJw5A8hC29amlP1KykIbibYP5ftJXLlCVinIPOBQhI4pHyDFof7rItIYUNR
0mbCZtoLK4WcRHQinSucUxw4avJLFJyQteizB7dNicxlQ5+KqmAkG8I929iHiy9Q
QsoWOZrb4QRWT27sOTI2AIgt6roYfLVy4W/i0M547BzFhs7nygkW6TDB76aRuAop
W0ueDcGMlwo3vA/vPt8OnpuyBiVC+D1igMEs8sDipd0BzhtONZ2NkOP+qm57vgdJ
z3QFsZAoUcBeMEs/utfnHGQWV6WhzjVEUCN3mfE9a0H0CeMu6hljCLJZJU6k+8Bm
KO5+iWIKazjD7xvbL86tNjl/2L8nOU0cWG9U6t66MPIOFbKBe6ZUjueBozSI+mZE
PNLUhu+VOTphbphk3TvkRWonWt6S5pZQ1R2a13I58SffKu+qWWG+PkIOipiZaaC1
UdLV/HGFEMDg1lY9Jr2o
=DBlT
-----END PGP SIGNATURE-----