[Piglit] [PATCH 10/11] shaders: port "GLSL link mismatched invariant" to shader_runner

[Dylan Baker]

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/all.py                                       |  5 -----
 tests/shaders/glsl-link-invariant-01a.vert         |  7 -------
 tests/shaders/glsl-link-invariant-01b.vert         |  6 ------
 .../linker/invariant-mismatched.shader_test        | 22 ++++++++++++++++++++++
 4 files changed, 22 insertions(+), 18 deletions(-)
 delete mode 100644 tests/shaders/glsl-link-invariant-01a.vert
 delete mode 100644 tests/shaders/glsl-link-invariant-01b.vert
 create mode 100644 tests/spec/glsl-1.20/linker/invariant-mismatched.shader_test

diff --git a/tests/all.py b/tests/all.py
index a6166f1..17d97a1 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -595,11 +595,6 @@ with profile.group_manager(PiglitGLTest, 'shaders') as g:
     g(['glsl-vs-int-attrib'])
     g(['glsl-link-initializer-03'],
       'GLSL link two programs, global initializer')
-    g(['glsl-link-test',
-       os.path.join('shaders', 'glsl-link-invariant-01a.vert'),
-       os.path.join('shaders', 'glsl-link-invariant-01b.vert'),
-       'fail'],
-      'GLSL link mismatched invariant')
     g(['glsl-getactiveuniform-count',
        os.path.join('shaders', 'glsl-getactiveuniform-length.vert'), '1'],
       'glsl-getactiveuniform-count: {}'.format('glsl-getactiveuniform-length'))
diff --git a/tests/shaders/glsl-link-invariant-01a.vert b/tests/shaders/glsl-link-invariant-01a.vert
deleted file mode 100644
index 0783ac9..0000000
--- a/tests/shaders/glsl-link-invariant-01a.vert
+++ /dev/null
@@ -1,7 +0,0 @@
-#version 120
-invariant varying float var;
-
-void main()
-{
-  gl_Position = gl_Vertex;
-}
diff --git a/tests/shaders/glsl-link-invariant-01b.vert b/tests/shaders/glsl-link-invariant-01b.vert
deleted file mode 100644
index 680572a..0000000
--- a/tests/shaders/glsl-link-invariant-01b.vert
+++ /dev/null
@@ -1,6 +0,0 @@
-#version 120
-varying float var;
-
-void myfunc()
-{
-}
diff --git a/tests/spec/glsl-1.20/linker/invariant-mismatched.shader_test b/tests/spec/glsl-1.20/linker/invariant-mismatched.shader_test
new file mode 100644
index 0000000..951e240
--- /dev/null
+++ b/tests/spec/glsl-1.20/linker/invariant-mismatched.shader_test
@@ -0,0 +1,22 @@
+[require]
+GLSL >= 1.20
+
+[vertex shader]
+#version 120
+invariant varying float var;
+
+void main()
+{
+  gl_Position = gl_Vertex;
+}
+
+[vertex shader]
+#version 120
+varying float var;
+
+void myfunc()
+{
+}
+
+[test]
+link error
-- 
2.8.2