[Piglit] [PATCH] arb_enhanced_layouts: test matrix attributes can't have a component qualifier

2016-01-25 Thread Timothy Arceri 
I filled a spec bug for this as the GL Core spec seems to conflict
with the GLSL spec on this and its been confirmed that they are
not intended to be allowed.
---
 .../component-layout/matrix-array-attribute.vert | 20 
 .../compiler/component-layout/matrix-attribute.vert  | 20 
 2 files changed, 40 insertions(+)
 create mode 100644 
tests/spec/arb_enhanced_layouts/compiler/component-layout/matrix-array-attribute.vert
 create mode 100644 
tests/spec/arb_enhanced_layouts/compiler/component-layout/matrix-attribute.vert

diff --git 
a/tests/spec/arb_enhanced_layouts/compiler/component-layout/matrix-array-attribute.vert
 
b/tests/spec/arb_enhanced_layouts/compiler/component-layout/matrix-array-attribute.vert
new file mode 100644
index 000..34efe22
--- /dev/null
+++ 
b/tests/spec/arb_enhanced_layouts/compiler/component-layout/matrix-array-attribute.vert
@@ -0,0 +1,20 @@
+// [config]
+// expect_result: fail
+// glsl_version: 1.50
+// require_extensions: GL_ARB_enhanced_layouts GL_ARB_explicit_attrib_location
+// [end config]
+//
+// From Section 4.4.1 (Input Layout Qualifiers) of the GLSL 4.50 spec:
+//
+//   "It is a compile-time error to apply the component qualifier to a matrix,
+//   a structure, a block, or an array containing any of these."
+
+#version 150
+#extension GL_ARB_enhanced_layouts: require
+#extension GL_ARB_explicit_attrib_location: require
+
+layout(location = 0, component = 1) in mat3 a[32];
+
+void main()
+{
+}
diff --git 
a/tests/spec/arb_enhanced_layouts/compiler/component-layout/matrix-attribute.vert
 
b/tests/spec/arb_enhanced_layouts/compiler/component-layout/matrix-attribute.vert
new file mode 100644
index 000..d889a20
--- /dev/null
+++ 
b/tests/spec/arb_enhanced_layouts/compiler/component-layout/matrix-attribute.vert
@@ -0,0 +1,20 @@
+// [config]
+// expect_result: fail
+// glsl_version: 1.40
+// require_extensions: GL_ARB_enhanced_layouts GL_ARB_explicit_attrib_location
+// [end config]
+//
+// From Section 4.4.1 (Input Layout Qualifiers) of the GLSL 4.50 spec:
+//
+//   "It is a compile-time error to apply the component qualifier to a matrix,
+//   a structure, a block, or an array containing any of these."
+
+#version 140
+#extension GL_ARB_enhanced_layouts: require
+#extension GL_ARB_explicit_attrib_location: require
+
+layout(location = 0, component = 1) in mat3 a;
+
+void main()
+{
+}
-- 
2.5.0

___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH 2/2] gl-3.1: test for linking error with an empty program

2016-01-25 Thread Timothy Arceri 
From Section 7.3 (PROGRAM OBJECTS) of the OpenGL 4.5 spec:

"Linking can fail for a variety of reasons as specified in the
OpenGL Shading Language Specification, as well as any of the
following reasons:

 - No shader objects are attached to program."

Cc: Ian Romanick 
---
 tests/all.py |  1 +
 tests/spec/gl-3.1/CMakeLists.gl.txt  |  1 +
 tests/spec/gl-3.1/glsl-link-empty-prog.c | 70 
 3 files changed, 72 insertions(+)
 create mode 100644 tests/spec/gl-3.1/glsl-link-empty-prog.c

diff --git a/tests/all.py b/tests/all.py
index 1e720d0..54aba72 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -1187,6 +1187,7 @@ with profile.group_manager(
 g(['gl-3.1-default-vao'], 'default-vao')
 g(['gl-3.1-draw-buffers-errors'], 'draw-buffers-errors')
 g(['gl-3.1-genned-names'], 'genned-names')
+g(['gl-3.1-link-empty-prog-core'])
 g(['gl-3.1-minmax'], 'minmax')
 g(['gl-3.1-vao-broken-attrib'], 'vao-broken-attrib')
 g(['gl-3.0-required-renderbuffer-attachment-formats', '31'],
diff --git a/tests/spec/gl-3.1/CMakeLists.gl.txt 
b/tests/spec/gl-3.1/CMakeLists.gl.txt
index 0a1a97c..9c6472a 100644
--- a/tests/spec/gl-3.1/CMakeLists.gl.txt
+++ b/tests/spec/gl-3.1/CMakeLists.gl.txt
@@ -11,6 +11,7 @@ link_libraries (
 piglit_add_executable (gl-3.1-default-vao default-vao.c)
 piglit_add_executable (gl-3.1-draw-buffers-errors draw-buffers-errors.c)
 piglit_add_executable (gl-3.1-genned-names genned-names.c)
+piglit_add_executable (gl-3.1-link-empty-prog-core glsl-link-empty-prog.c)
 piglit_add_executable (gl-3.1-minmax minmax.c)
 piglit_add_executable (gl-3.1-primitive-restart-xfb primitive-restart-xfb.c)
 piglit_add_executable (gl-3.1-vao-broken-attrib vao-broken-attrib.c)
diff --git a/tests/spec/gl-3.1/glsl-link-empty-prog.c 
b/tests/spec/gl-3.1/glsl-link-empty-prog.c
new file mode 100644
index 000..1f3f9bb
--- /dev/null
+++ b/tests/spec/gl-3.1/glsl-link-empty-prog.c
@@ -0,0 +1,70 @@
+/*
+ * Copyright © 2016 Intel Corporation
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice (including the next
+ * paragraph) shall be included in all copies or substantial portions of the
+ * Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+/**
+ * From Section 7.3 (PROGRAM OBJECTS) of the OpenGL 4.5 spec:
+ *
+ *   "Linking can fail for a variety of reasons as specified in the OpenGL
+ *   Shading Language Specification, as well as any of the following reasons:
+ *
+ *   - No shader objects are attached to program."
+ */
+
+#include "piglit-util-gl.h"
+
+PIGLIT_GL_TEST_CONFIG_BEGIN
+
+   config.supports_gl_core_version = 31;
+
+   config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
+
+PIGLIT_GL_TEST_CONFIG_END
+
+void
+piglit_init(int argc, char **argv)
+{
+   GLint objID = glCreateProgram();
+
+   /* Check the link status is set to false */
+   glLinkProgram(objID);
+   if (piglit_link_check_status(objID))
+   piglit_report_result(PIGLIT_FAIL);
+
+   /* UseProgram should throw an error when the program has not been
+* successfully linked.
+*/
+   glUseProgram(objID);
+   if (!piglit_check_gl_error(GL_INVALID_OPERATION))
+   piglit_report_result(PIGLIT_FAIL);
+
+   glDeleteProgram(objID);
+
+   piglit_report_result(PIGLIT_PASS);
+}
+
+enum piglit_result
+piglit_display(void)
+{
+   /* Should never be reached */
+   return PIGLIT_FAIL;
+}
-- 
2.4.3

___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

[Piglit] [PATCH 1/2] glsl: tidy up link empty program tests

2016-01-25 Thread Timothy Arceri 
There are two tests, the second test covers what the first
test is doing plus more, so remove the first test.

Add a check that glUseProgram doesn't generate an error when
linked program is empty.

Finally move the remaining test out of the shaders folder.

Cc: Ilia Mirkin 
Cc: Ian Romanick 
---
 tests/all.py   |  3 +-
 tests/shaders/CMakeLists.gl.txt|  2 -
 tests/shaders/glsl-link-empty-prog-01.c| 53 --
 tests/spec/gl-2.0/CMakeLists.gl.txt|  1 +
 .../gl-2.0/glsl-link-empty-prog.c} |  2 +
 5 files changed, 4 insertions(+), 57 deletions(-)
 delete mode 100644 tests/shaders/glsl-link-empty-prog-01.c
 rename tests/{shaders/glsl-link-empty-prog-02.c => 
spec/gl-2.0/glsl-link-empty-prog.c} (98%)

diff --git a/tests/all.py b/tests/all.py
index 8e3cf85..1e720d0 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -557,8 +557,6 @@ with profile.group_manager(PiglitGLTest, 'shaders') as g:
 g(['glsl-light-model'])
 g(['glsl-link-bug30552'])
 g(['glsl-link-bug38015'])
-g(['glsl-link-empty-prog-01'])
-g(['glsl-link-empty-prog-02'])
 g(['glsl-max-vertex-attrib'])
 g(['glsl-kwin-blur-1'])
 g(['glsl-kwin-blur-2'])
@@ -1080,6 +1078,7 @@ with profile.group_manager(
 g(['gl-2.0-edgeflag'])
 g(['gl-2.0-edgeflag-immediate'])
 g(['gl-2.0-large-point-fs'])
+g(['gl-2.0-link-empty-prog'])
 g(['gl-2.0-two-sided-stencil'])
 g(['gl-2.0-vertexattribpointer'])
 g(['gl-2.0-vertex-const-attr'])
diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index abbe14c..42c6fae 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -111,8 +111,6 @@ piglit_add_executable (glsl-vs-user-varying-ff 
glsl-vs-user-varying-ff.c)
 piglit_add_executable (glsl-light-model glsl-light-model.c)
 piglit_add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
 piglit_add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
-piglit_add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
-piglit_add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
 piglit_add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
 piglit_add_executable (glsl-link-test glsl-link-test.c)
 piglit_add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
diff --git a/tests/shaders/glsl-link-empty-prog-01.c 
b/tests/shaders/glsl-link-empty-prog-01.c
deleted file mode 100644
index 88c24d7..000
--- a/tests/shaders/glsl-link-empty-prog-01.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2010 Török Edwin
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
-   config.supports_gl_compat_version = 10;
-
-   config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-enum piglit_result piglit_display(void)
-{
-GLint objID = glCreateProgram();
-/* check that it doesn't crash when linking empty shader */
-glLinkProgram(objID);
-glValidateProgram(objID);
-if (!piglit_link_check_status(objID))
-   piglit_report_result(PIGLIT_FAIL);
-glUseProgram(objID);
-glUseProgram(0);
-glDeleteProgram(objID);
-piglit_report_result(PIGLIT_PASS);
-return PIGLIT_PASS;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
-   piglit_require_gl_version(20);
-}
diff --git a/tests/spec/gl-2.0/CMakeLists.gl.txt 
b/tests/spec/gl-2.0/CMakeLists.gl.txt
index 20b315a..b171dea 100644
--- a/tests/spec/gl-2.0/CMakeLists.gl.txt
+++ b/tests/spec/gl-2.0/CMakeLists.gl.txt
@@ -13,6 +13,7 @@ piglit_add_executable (vertex-program-two-side 
vertex-program-two-side.c)
 piglit_add_executable (gl-2.0-edgeflag edgeflag.c)
 piglit_add_executable (gl-2.0-edgeflag-immediate edgeflag-immediate.c)
 piglit_add_executable (gl-2.0-large-point-fs large-poi

Re: [Piglit] [PATCH] glsl: fix link empty program tests

2016-01-25 Thread Ian Romanick 
As Tapani pointed out, this change is not valid for compatibility
profile... and both of these tests currently pass on Mesa.

Looking at the two tests, I'm not sure what the value is of having both.
 glsl-link-empty-prog-01.c appears to try to reproduce a bug when
linking a program with no shaders attached.  The commit message
(f55c0c284) is pretty terse.

Török Edwin wrote the first test, and I committed both.  There was a
small amount of discussion on the mesa-dev mailing list:


http://lists.freedesktop.org/archives/mesa-dev/2010-September/002698.html

I think glsl-link-empty-prog-02.c should hit the same crash that
glsl-link-empty-prog-01.c was trying to reproduce.  At this point, we
could probably just remove glsl-link-empty-prog-01.c.  It has a lot of
cruft in it that should get cleaned up otherwise.  A lot has changed in
piglit since 2010, and we wouldn't accept a new test that looks like
this. :)

We should have a test that verifies the core profile restriction.  I
haven't checked, so it's possible that there already is one.

On 01/25/2016 03:43 AM, Timothy Arceri wrote:
> Also move them out of the shaders folder.
> 
> From Section 7.3 (PROGRAM OBJECTS) of the OpenGL 4.5 spec:
> 
>"Linking can fail for a variety of reasons as specified in the
>OpenGL Shading Language Specification, as well as any of the
>following reasons:
> 
> - No shader objects are attached to program."
> ---
>  tests/shaders/CMakeLists.gl.txt |   2 -
>  tests/shaders/glsl-link-empty-prog-01.c |  53 -
>  tests/shaders/glsl-link-empty-prog-02.c | 115 
> 
>  tests/spec/gl-2.0/CMakeLists.gl.txt |   2 +
>  tests/spec/gl-2.0/glsl-link-empty-prog-01.c |  53 +
>  tests/spec/gl-2.0/glsl-link-empty-prog-02.c | 115 
> 
>  6 files changed, 170 insertions(+), 170 deletions(-)
>  delete mode 100644 tests/shaders/glsl-link-empty-prog-01.c
>  delete mode 100644 tests/shaders/glsl-link-empty-prog-02.c
>  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-01.c
>  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-02.c
> 
> diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
> index abbe14c..42c6fae 100644
> --- a/tests/shaders/CMakeLists.gl.txt
> +++ b/tests/shaders/CMakeLists.gl.txt
> @@ -111,8 +111,6 @@ piglit_add_executable (glsl-vs-user-varying-ff 
> glsl-vs-user-varying-ff.c)
>  piglit_add_executable (glsl-light-model glsl-light-model.c)
>  piglit_add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
>  piglit_add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
> -piglit_add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
> -piglit_add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
>  piglit_add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
>  piglit_add_executable (glsl-link-test glsl-link-test.c)
>  piglit_add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
> diff --git a/tests/shaders/glsl-link-empty-prog-01.c 
> b/tests/shaders/glsl-link-empty-prog-01.c
> deleted file mode 100644
> index 88c24d7..000
> --- a/tests/shaders/glsl-link-empty-prog-01.c
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -/*
> - * Copyright © 2010 Török Edwin
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the next
> - * paragraph) shall be included in all copies or substantial portions of the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
> DEALINGS
> - * IN THE SOFTWARE.
> - */
> -
> -#include "piglit-util-gl.h"
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> -
> - config.supports_gl_compat_version = 10;
> -
> - config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> -
> -PIGLIT_GL_TEST_CONFIG_END
> -
> -enum piglit_result piglit_display(void)
> -{
> -GLint objID = glCreateProgram();
> -/* check that it doesn't crash when linking empty shader */
> -glLinkProgram(objID);
> -glValidateProgram(objID);
> -if (!piglit_link_check_status(objID))
> - piglit_report_result(PIGLIT_F

Re: [Piglit] [PATCH] glsl: fix link empty program tests

2016-01-25 Thread Ian Romanick 
On 01/25/2016 06:15 AM, Ilia Mirkin wrote:
> It's _really_ difficult to tell what you've changed -- could you
> resend with the diff generated with -M? (That flag should be accepted
> by format-patch as well.)

I like that!  I was going to suggest submitting to patches (one that
moves the test, one that changes the test), but this sounds like less work.

> On Mon, Jan 25, 2016 at 6:43 AM, Timothy Arceri
>  wrote:
>> Also move them out of the shaders folder.
>>
>> From Section 7.3 (PROGRAM OBJECTS) of the OpenGL 4.5 spec:
>>
>>"Linking can fail for a variety of reasons as specified in the
>>OpenGL Shading Language Specification, as well as any of the
>>following reasons:
>>
>> - No shader objects are attached to program."
>> ---
>>  tests/shaders/CMakeLists.gl.txt |   2 -
>>  tests/shaders/glsl-link-empty-prog-01.c |  53 -
>>  tests/shaders/glsl-link-empty-prog-02.c | 115 
>> 
>>  tests/spec/gl-2.0/CMakeLists.gl.txt |   2 +
>>  tests/spec/gl-2.0/glsl-link-empty-prog-01.c |  53 +
>>  tests/spec/gl-2.0/glsl-link-empty-prog-02.c | 115 
>> 
>>  6 files changed, 170 insertions(+), 170 deletions(-)
>>  delete mode 100644 tests/shaders/glsl-link-empty-prog-01.c
>>  delete mode 100644 tests/shaders/glsl-link-empty-prog-02.c
>>  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-01.c
>>  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-02.c
>>
>> diff --git a/tests/shaders/CMakeLists.gl.txt 
>> b/tests/shaders/CMakeLists.gl.txt
>> index abbe14c..42c6fae 100644
>> --- a/tests/shaders/CMakeLists.gl.txt
>> +++ b/tests/shaders/CMakeLists.gl.txt
>> @@ -111,8 +111,6 @@ piglit_add_executable (glsl-vs-user-varying-ff 
>> glsl-vs-user-varying-ff.c)
>>  piglit_add_executable (glsl-light-model glsl-light-model.c)
>>  piglit_add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
>>  piglit_add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
>> -piglit_add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
>> -piglit_add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
>>  piglit_add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
>>  piglit_add_executable (glsl-link-test glsl-link-test.c)
>>  piglit_add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
>> diff --git a/tests/shaders/glsl-link-empty-prog-01.c 
>> b/tests/shaders/glsl-link-empty-prog-01.c
>> deleted file mode 100644
>> index 88c24d7..000
>> --- a/tests/shaders/glsl-link-empty-prog-01.c
>> +++ /dev/null
>> @@ -1,53 +0,0 @@
>> -/*
>> - * Copyright © 2010 Török Edwin
>> - *
>> - * Permission is hereby granted, free of charge, to any person obtaining a
>> - * copy of this software and associated documentation files (the 
>> "Software"),
>> - * to deal in the Software without restriction, including without limitation
>> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
>> - * and/or sell copies of the Software, and to permit persons to whom the
>> - * Software is furnished to do so, subject to the following conditions:
>> - *
>> - * The above copyright notice and this permission notice (including the next
>> - * paragraph) shall be included in all copies or substantial portions of the
>> - * Software.
>> - *
>> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS 
>> OR
>> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
>> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
>> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 
>> OTHER
>> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
>> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
>> DEALINGS
>> - * IN THE SOFTWARE.
>> - */
>> -
>> -#include "piglit-util-gl.h"
>> -
>> -PIGLIT_GL_TEST_CONFIG_BEGIN
>> -
>> -   config.supports_gl_compat_version = 10;
>> -
>> -   config.window_visual = PIGLIT_GL_VISUAL_RGB | 
>> PIGLIT_GL_VISUAL_DOUBLE;
>> -
>> -PIGLIT_GL_TEST_CONFIG_END
>> -
>> -enum piglit_result piglit_display(void)
>> -{
>> -GLint objID = glCreateProgram();
>> -/* check that it doesn't crash when linking empty shader */
>> -glLinkProgram(objID);
>> -glValidateProgram(objID);
>> -if (!piglit_link_check_status(objID))
>> -   piglit_report_result(PIGLIT_FAIL);
>> -glUseProgram(objID);
>> -glUseProgram(0);
>> -glDeleteProgram(objID);
>> -piglit_report_result(PIGLIT_PASS);
>> -return PIGLIT_PASS;
>> -}
>> -
>> -void
>> -piglit_init(int argc, char **argv)
>> -{
>> -   piglit_require_gl_version(20);
>> -}
>> diff --git a/tests/shaders/glsl-link-empty-prog-02.c 
>> b/tests/shaders/glsl-link-empty-prog-02.c
>> deleted file mode 100644
>> index c684047..000
>> --- a/tests/shaders/glsl-link-empty-prog-02.c
>> +++ /dev/null
>> @@ -1,115 +0,0 @@
>> -/*
>> - * Copyright © 2010 Intel Corporation
>>

[Piglit] [Bug 93856] New: piglit summary aggregate problem

2016-01-25 Thread bugzilla-daemon 
https://bugs.freedesktop.org/show_bug.cgi?id=93856

Bug ID: 93856
   Summary: piglit summary aggregate problem
   Product: piglit
   Version: unspecified
  Hardware: Other
OS: All
Status: NEW
  Severity: normal
  Priority: medium
 Component: infrastructure
  Assignee: baker.dyla...@gmail.com
  Reporter: tomi.p.sarv...@intel.com
QA Contact: piglit@lists.freedesktop.org

Hello,

I'm trying to create a results.json from incomplete testresults: when hang and
reboot happens, I don't want to resume.
It seems that "summary aggregate" should do the right thing, but I'm not
getting anything:

# /opt/igt/piglit/piglit summary aggregate -o results.json tests/
Warning: A python exception that should have been handled was not. This is bug
and should be reported.
BUG: No backend found for any file in tests

Example of the file I'm trying to feed to piglit:

# cat tests/0.json
{"igt@gem_mmap_gtt@basic-short": {"returncode": 0, "pid": 5652, "result":
"pass", "subtests": {"__type__": "Subtests"}, "out": "IGT-Version:
1.13-g9bf4e19 (x86_64) (Linux: 4.5.0-rc1-gfxbench+ x86_64)\nSubtest
basic-short: SUCCESS (0.072s)\n", "dmesg": "", "exception": null, "err": "",
"traceback": null, "__type__": "TestResult", "environment":
"PIGLIT_SOURCE_DIR=\"/opt/igt/piglit\" PIGLIT_PLATFORM=\"mixed_glx_egl\"",
"command": "/opt/igt/tests/gem_mmap_gtt --run-subtest basic-short", "time":
{"start": 1453728427.467537, "end": 1453728427.567162, "__type__":
"TimeAttribute"}}}

Version b3474da8330b8c8a1d0ad5a1fbfc9f3c3a7a1dba xts: Add a rendercheck case
for a bug I made in glamor.

-- 
You are receiving this mail because:
You are the QA Contact for the bug.___
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit

Re: [Piglit] [PATCH] glsl: fix link empty program tests

2016-01-25 Thread Ilia Mirkin 
It's _really_ difficult to tell what you've changed -- could you
resend with the diff generated with -M? (That flag should be accepted
by format-patch as well.)

On Mon, Jan 25, 2016 at 6:43 AM, Timothy Arceri
 wrote:
> Also move them out of the shaders folder.
>
> From Section 7.3 (PROGRAM OBJECTS) of the OpenGL 4.5 spec:
>
>"Linking can fail for a variety of reasons as specified in the
>OpenGL Shading Language Specification, as well as any of the
>following reasons:
>
> - No shader objects are attached to program."
> ---
>  tests/shaders/CMakeLists.gl.txt |   2 -
>  tests/shaders/glsl-link-empty-prog-01.c |  53 -
>  tests/shaders/glsl-link-empty-prog-02.c | 115 
> 
>  tests/spec/gl-2.0/CMakeLists.gl.txt |   2 +
>  tests/spec/gl-2.0/glsl-link-empty-prog-01.c |  53 +
>  tests/spec/gl-2.0/glsl-link-empty-prog-02.c | 115 
> 
>  6 files changed, 170 insertions(+), 170 deletions(-)
>  delete mode 100644 tests/shaders/glsl-link-empty-prog-01.c
>  delete mode 100644 tests/shaders/glsl-link-empty-prog-02.c
>  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-01.c
>  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-02.c
>
> diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
> index abbe14c..42c6fae 100644
> --- a/tests/shaders/CMakeLists.gl.txt
> +++ b/tests/shaders/CMakeLists.gl.txt
> @@ -111,8 +111,6 @@ piglit_add_executable (glsl-vs-user-varying-ff 
> glsl-vs-user-varying-ff.c)
>  piglit_add_executable (glsl-light-model glsl-light-model.c)
>  piglit_add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
>  piglit_add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
> -piglit_add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
> -piglit_add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
>  piglit_add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
>  piglit_add_executable (glsl-link-test glsl-link-test.c)
>  piglit_add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
> diff --git a/tests/shaders/glsl-link-empty-prog-01.c 
> b/tests/shaders/glsl-link-empty-prog-01.c
> deleted file mode 100644
> index 88c24d7..000
> --- a/tests/shaders/glsl-link-empty-prog-01.c
> +++ /dev/null
> @@ -1,53 +0,0 @@
> -/*
> - * Copyright © 2010 Török Edwin
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - * and/or sell copies of the Software, and to permit persons to whom the
> - * Software is furnished to do so, subject to the following conditions:
> - *
> - * The above copyright notice and this permission notice (including the next
> - * paragraph) shall be included in all copies or substantial portions of the
> - * Software.
> - *
> - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
> - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
> DEALINGS
> - * IN THE SOFTWARE.
> - */
> -
> -#include "piglit-util-gl.h"
> -
> -PIGLIT_GL_TEST_CONFIG_BEGIN
> -
> -   config.supports_gl_compat_version = 10;
> -
> -   config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
> -
> -PIGLIT_GL_TEST_CONFIG_END
> -
> -enum piglit_result piglit_display(void)
> -{
> -GLint objID = glCreateProgram();
> -/* check that it doesn't crash when linking empty shader */
> -glLinkProgram(objID);
> -glValidateProgram(objID);
> -if (!piglit_link_check_status(objID))
> -   piglit_report_result(PIGLIT_FAIL);
> -glUseProgram(objID);
> -glUseProgram(0);
> -glDeleteProgram(objID);
> -piglit_report_result(PIGLIT_PASS);
> -return PIGLIT_PASS;
> -}
> -
> -void
> -piglit_init(int argc, char **argv)
> -{
> -   piglit_require_gl_version(20);
> -}
> diff --git a/tests/shaders/glsl-link-empty-prog-02.c 
> b/tests/shaders/glsl-link-empty-prog-02.c
> deleted file mode 100644
> index c684047..000
> --- a/tests/shaders/glsl-link-empty-prog-02.c
> +++ /dev/null
> @@ -1,115 +0,0 @@
> -/*
> - * Copyright © 2010 Intel Corporation
> - *
> - * Permission is hereby granted, free of charge, to any person obtaining a
> - * copy of this software and associated documentation files (the "Software"),
> - * to deal in the Software without restriction, including without limitation
> - * the rights to use, copy, modify, merge, publish, distribute, sublicense,
> - *

Re: [Piglit] [PATCH] glsl: fix link empty program tests

2016-01-25 Thread Tapani Pälli 



On 01/25/2016 02:25 PM, Tapani Pälli wrote:



On 01/25/2016 01:43 PM, Timothy Arceri wrote:

Also move them out of the shaders folder.

 From Section 7.3 (PROGRAM OBJECTS) of the OpenGL 4.5 spec:

"Linking can fail for a variety of reasons as specified in the
OpenGL Shading Language Specification, as well as any of the
following reasons:

 - No shader objects are attached to program."



Note that this is only in core spec, compatibility spec does not mention
this restriction. I'm not sure what's the reason for this difference.


Answering to myself, I think it's is explained here:
https://cvs.khronos.org/bugzilla/show_bug.cgi?id=12215




---
  tests/shaders/CMakeLists.gl.txt |   2 -
  tests/shaders/glsl-link-empty-prog-01.c |  53 -
  tests/shaders/glsl-link-empty-prog-02.c | 115

  tests/spec/gl-2.0/CMakeLists.gl.txt |   2 +
  tests/spec/gl-2.0/glsl-link-empty-prog-01.c |  53 +
  tests/spec/gl-2.0/glsl-link-empty-prog-02.c | 115

  6 files changed, 170 insertions(+), 170 deletions(-)
  delete mode 100644 tests/shaders/glsl-link-empty-prog-01.c
  delete mode 100644 tests/shaders/glsl-link-empty-prog-02.c
  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-01.c
  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-02.c

diff --git a/tests/shaders/CMakeLists.gl.txt
b/tests/shaders/CMakeLists.gl.txt
index abbe14c..42c6fae 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -111,8 +111,6 @@ piglit_add_executable (glsl-vs-user-varying-ff
glsl-vs-user-varying-ff.c)
  piglit_add_executable (glsl-light-model glsl-light-model.c)
  piglit_add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
  piglit_add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
-piglit_add_executable (glsl-link-empty-prog-01
glsl-link-empty-prog-01.c)
-piglit_add_executable (glsl-link-empty-prog-02
glsl-link-empty-prog-02.c)
  piglit_add_executable (glsl-link-initializer-03
glsl-link-initializer-03.c)
  piglit_add_executable (glsl-link-test glsl-link-test.c)
  piglit_add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
diff --git a/tests/shaders/glsl-link-empty-prog-01.c
b/tests/shaders/glsl-link-empty-prog-01.c
deleted file mode 100644
index 88c24d7..000
--- a/tests/shaders/glsl-link-empty-prog-01.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2010 Török Edwin
- *
- * Permission is hereby granted, free of charge, to any person
obtaining a
- * copy of this software and associated documentation files (the
"Software"),
- * to deal in the Software without restriction, including without
limitation
- * the rights to use, copy, modify, merge, publish, distribute,
sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including
the next
- * paragraph) shall be included in all copies or substantial portions
of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT
SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES
OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
-config.supports_gl_compat_version = 10;
-
-config.window_visual = PIGLIT_GL_VISUAL_RGB |
PIGLIT_GL_VISUAL_DOUBLE;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-enum piglit_result piglit_display(void)
-{
-GLint objID = glCreateProgram();
-/* check that it doesn't crash when linking empty shader */
-glLinkProgram(objID);
-glValidateProgram(objID);
-if (!piglit_link_check_status(objID))
-piglit_report_result(PIGLIT_FAIL);
-glUseProgram(objID);
-glUseProgram(0);
-glDeleteProgram(objID);
-piglit_report_result(PIGLIT_PASS);
-return PIGLIT_PASS;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
-piglit_require_gl_version(20);
-}
diff --git a/tests/shaders/glsl-link-empty-prog-02.c
b/tests/shaders/glsl-link-empty-prog-02.c
deleted file mode 100644
index c684047..000
--- a/tests/shaders/glsl-link-empty-prog-02.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person
obtaining a
- * copy of this software and associated documentation files (the
"Software"),
- * to deal in the Software without restriction, including without
limitation
- * the rights to use, copy, modify, merge, publish, distribute,
sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Softwa

Re: [Piglit] [PATCH] glsl: fix link empty program tests

2016-01-25 Thread Tapani Pälli 



On 01/25/2016 01:43 PM, Timothy Arceri wrote:

Also move them out of the shaders folder.

 From Section 7.3 (PROGRAM OBJECTS) of the OpenGL 4.5 spec:

"Linking can fail for a variety of reasons as specified in the
OpenGL Shading Language Specification, as well as any of the
following reasons:

 - No shader objects are attached to program."



Note that this is only in core spec, compatibility spec does not mention 
this restriction. I'm not sure what's the reason for this difference.




---
  tests/shaders/CMakeLists.gl.txt |   2 -
  tests/shaders/glsl-link-empty-prog-01.c |  53 -
  tests/shaders/glsl-link-empty-prog-02.c | 115 
  tests/spec/gl-2.0/CMakeLists.gl.txt |   2 +
  tests/spec/gl-2.0/glsl-link-empty-prog-01.c |  53 +
  tests/spec/gl-2.0/glsl-link-empty-prog-02.c | 115 
  6 files changed, 170 insertions(+), 170 deletions(-)
  delete mode 100644 tests/shaders/glsl-link-empty-prog-01.c
  delete mode 100644 tests/shaders/glsl-link-empty-prog-02.c
  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-01.c
  create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-02.c

diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index abbe14c..42c6fae 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -111,8 +111,6 @@ piglit_add_executable (glsl-vs-user-varying-ff 
glsl-vs-user-varying-ff.c)
  piglit_add_executable (glsl-light-model glsl-light-model.c)
  piglit_add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
  piglit_add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
-piglit_add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
-piglit_add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
  piglit_add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
  piglit_add_executable (glsl-link-test glsl-link-test.c)
  piglit_add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
diff --git a/tests/shaders/glsl-link-empty-prog-01.c 
b/tests/shaders/glsl-link-empty-prog-01.c
deleted file mode 100644
index 88c24d7..000
--- a/tests/shaders/glsl-link-empty-prog-01.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2010 Török Edwin
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
-   config.supports_gl_compat_version = 10;
-
-   config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-enum piglit_result piglit_display(void)
-{
-GLint objID = glCreateProgram();
-/* check that it doesn't crash when linking empty shader */
-glLinkProgram(objID);
-glValidateProgram(objID);
-if (!piglit_link_check_status(objID))
-   piglit_report_result(PIGLIT_FAIL);
-glUseProgram(objID);
-glUseProgram(0);
-glDeleteProgram(objID);
-piglit_report_result(PIGLIT_PASS);
-return PIGLIT_PASS;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
-   piglit_require_gl_version(20);
-}
diff --git a/tests/shaders/glsl-link-empty-prog-02.c 
b/tests/shaders/glsl-link-empty-prog-02.c
deleted file mode 100644
index c684047..000
--- a/tests/shaders/glsl-link-empty-prog-02.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the n

[Piglit] [PATCH] glsl: fix link empty program tests

2016-01-25 Thread Timothy Arceri 
Also move them out of the shaders folder.

From Section 7.3 (PROGRAM OBJECTS) of the OpenGL 4.5 spec:

   "Linking can fail for a variety of reasons as specified in the
   OpenGL Shading Language Specification, as well as any of the
   following reasons:

- No shader objects are attached to program."
---
 tests/shaders/CMakeLists.gl.txt |   2 -
 tests/shaders/glsl-link-empty-prog-01.c |  53 -
 tests/shaders/glsl-link-empty-prog-02.c | 115 
 tests/spec/gl-2.0/CMakeLists.gl.txt |   2 +
 tests/spec/gl-2.0/glsl-link-empty-prog-01.c |  53 +
 tests/spec/gl-2.0/glsl-link-empty-prog-02.c | 115 
 6 files changed, 170 insertions(+), 170 deletions(-)
 delete mode 100644 tests/shaders/glsl-link-empty-prog-01.c
 delete mode 100644 tests/shaders/glsl-link-empty-prog-02.c
 create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-01.c
 create mode 100644 tests/spec/gl-2.0/glsl-link-empty-prog-02.c

diff --git a/tests/shaders/CMakeLists.gl.txt b/tests/shaders/CMakeLists.gl.txt
index abbe14c..42c6fae 100644
--- a/tests/shaders/CMakeLists.gl.txt
+++ b/tests/shaders/CMakeLists.gl.txt
@@ -111,8 +111,6 @@ piglit_add_executable (glsl-vs-user-varying-ff 
glsl-vs-user-varying-ff.c)
 piglit_add_executable (glsl-light-model glsl-light-model.c)
 piglit_add_executable (glsl-link-bug30552 glsl-link-bug30552.c)
 piglit_add_executable (glsl-link-bug38015 glsl-link-bug38015.c)
-piglit_add_executable (glsl-link-empty-prog-01 glsl-link-empty-prog-01.c)
-piglit_add_executable (glsl-link-empty-prog-02 glsl-link-empty-prog-02.c)
 piglit_add_executable (glsl-link-initializer-03 glsl-link-initializer-03.c)
 piglit_add_executable (glsl-link-test glsl-link-test.c)
 piglit_add_executable (gpu_shader4_attribs gpu_shader4_attribs.c)
diff --git a/tests/shaders/glsl-link-empty-prog-01.c 
b/tests/shaders/glsl-link-empty-prog-01.c
deleted file mode 100644
index 88c24d7..000
--- a/tests/shaders/glsl-link-empty-prog-01.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright © 2010 Török Edwin
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- */
-
-#include "piglit-util-gl.h"
-
-PIGLIT_GL_TEST_CONFIG_BEGIN
-
-   config.supports_gl_compat_version = 10;
-
-   config.window_visual = PIGLIT_GL_VISUAL_RGB | PIGLIT_GL_VISUAL_DOUBLE;
-
-PIGLIT_GL_TEST_CONFIG_END
-
-enum piglit_result piglit_display(void)
-{
-GLint objID = glCreateProgram();
-/* check that it doesn't crash when linking empty shader */
-glLinkProgram(objID);
-glValidateProgram(objID);
-if (!piglit_link_check_status(objID))
-   piglit_report_result(PIGLIT_FAIL);
-glUseProgram(objID);
-glUseProgram(0);
-glDeleteProgram(objID);
-piglit_report_result(PIGLIT_PASS);
-return PIGLIT_PASS;
-}
-
-void
-piglit_init(int argc, char **argv)
-{
-   piglit_require_gl_version(20);
-}
diff --git a/tests/shaders/glsl-link-empty-prog-02.c 
b/tests/shaders/glsl-link-empty-prog-02.c
deleted file mode 100644
index c684047..000
--- a/tests/shaders/glsl-link-empty-prog-02.c
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
- * Copyright © 2010 Intel Corporation
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice (including the next
- * paragraph) shall be included in all copies or substantial portions of the
- * Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO TH