[Piglit] [PATCH 6/6] Simplify GLSL link matched global initializer

[Ian Romanick]

From: Ian Romanick <ian.d.romanick at intel.com>

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
---
 tests/all.tests                              |    2 +-
 tests/shaders/glsl-link-initializer-04a.vert |    6 ------
 tests/shaders/glsl-link-initializer-04b.vert |    6 ------
 3 files changed, 1 insertions(+), 13 deletions(-)
 delete mode 100644 tests/shaders/glsl-link-initializer-04a.vert
 delete mode 100644 tests/shaders/glsl-link-initializer-04b.vert

diff --git a/tests/all.tests b/tests/all.tests
index a2c0f3c..a1e64a7 100644
--- a/tests/all.tests
+++ b/tests/all.tests
@@ -466,10 +466,10 @@ 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')
 shaders['GLSL link single global initializer, 2 shaders'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-01a.vert shaders/glsl-link-initializer-01b.vert pass')
+shaders['GLSL link matched global initializer, 2 shaders'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-01c.vert shaders/glsl-link-initializer-01d.vert pass')
 shaders['GLSL link mismatched global initializer, 2 shaders'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-01b.vert shaders/glsl-link-initializer-01d.vert fail')
 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')
 shaders['GLSL link matched global initializer expression'] = concurrent_test('glsl-link-test shaders/glsl-link-initializer-05a.vert shaders/glsl-link-initializer-05b.vert fail')
 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')
diff --git a/tests/shaders/glsl-link-initializer-04a.vert b/tests/shaders/glsl-link-initializer-04a.vert
deleted file mode 100644
index a13bd28..0000000
--- a/tests/shaders/glsl-link-initializer-04a.vert
+++ /dev/null
@@ -1,6 +0,0 @@
-float global_variable = 1.0;
-
-/* This works around a bug in Apple's GLSL compiler.  Their compiler won't allow
- * a shader doesn't have any executable code.
- */
-void apple_work_around1() {}
diff --git a/tests/shaders/glsl-link-initializer-04b.vert b/tests/shaders/glsl-link-initializer-04b.vert
deleted file mode 100644
index 60534c6..0000000
--- a/tests/shaders/glsl-link-initializer-04b.vert
+++ /dev/null
@@ -1,6 +0,0 @@
-float global_variable = 1.0;
-
-void main()
-{
-  gl_Position = gl_Vertex;
-}
-- 
1.7.6.4