[Piglit] [PATCH 06/11] shaders: port "GLSL link matched global initializer expression" to shader_runner

[Dylan Baker]

Signed-off-by: Dylan Baker <dylanx.c.baker at intel.com>
---
 tests/all.py                                            |  5 -----
 tests/shaders/glsl-link-initializer-05b.vert            |  8 --------
 .../global-initializer-matched-expression.shader_test}  | 17 +++++++++++++++++
 3 files changed, 17 insertions(+), 13 deletions(-)
 delete mode 100644 tests/shaders/glsl-link-initializer-05b.vert
 rename tests/{shaders/glsl-link-initializer-05a.vert => spec/glsl-1.10/linker/global-initializer-matched-expression.shader_test} (54%)

diff --git a/tests/all.py b/tests/all.py
index 9c65366..4c04909 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -596,11 +596,6 @@ with profile.group_manager(PiglitGLTest, 'shaders') as g:
     g(['glsl-link-initializer-03'],
       'GLSL link two programs, global initializer')
     g(['glsl-link-test',
-       os.path.join('shaders', 'glsl-link-initializer-05a.vert'),
-       os.path.join('shaders', 'glsl-link-initializer-05b.vert'),
-       'fail'],
-      'GLSL link matched global initializer expression')
-    g(['glsl-link-test',
        os.path.join('shaders', 'glsl-link-initializer-06a.vert'),
        os.path.join('shaders', 'glsl-link-initializer-06b.vert'),
        'fail'],
diff --git a/tests/shaders/glsl-link-initializer-05b.vert b/tests/shaders/glsl-link-initializer-05b.vert
deleted file mode 100644
index d23885e..0000000
--- a/tests/shaders/glsl-link-initializer-05b.vert
+++ /dev/null
@@ -1,8 +0,0 @@
-uniform float angle;
-uniform float scale;
-float global_variable = sin(angle) * scale;
-
-void main()
-{
-  gl_Position = gl_Vertex;
-}
diff --git a/tests/shaders/glsl-link-initializer-05a.vert b/tests/spec/glsl-1.10/linker/global-initializer-matched-expression.shader_test
similarity index 54%
rename from tests/shaders/glsl-link-initializer-05a.vert
rename to tests/spec/glsl-1.10/linker/global-initializer-matched-expression.shader_test
index 52f95c5..5a9b191 100644
--- a/tests/shaders/glsl-link-initializer-05a.vert
+++ b/tests/spec/glsl-1.10/linker/global-initializer-matched-expression.shader_test
@@ -1,3 +1,7 @@
+[require]
+GLSL >= 1.10
+
+[vertex shader]
 uniform float angle;
 uniform float scale;
 float global_variable = sin(angle) * scale;
@@ -6,3 +10,16 @@ float global_variable = sin(angle) * scale;
  * a shader doesn't have any executable code.
  */
 void apple_work_around1() {}
+
+[vertex shader]
+uniform float angle;
+uniform float scale;
+float global_variable = sin(angle) * scale;
+
+void main()
+{
+  gl_Position = gl_Vertex;
+}
+
+[test]
+link error
-- 
2.8.2