[Piglit] [PATCH 1/4] glean/glsl1: Delete duplicated conditional expressions tests.

[Matt Turner]

---
 tests/all.py           |  2 --
 tests/glean/tglsl1.cpp | 24 ------------------------
 2 files changed, 26 deletions(-)

diff --git a/tests/all.py b/tests/all.py
index fc92d51..8951f9e 100644
--- a/tests/all.py
+++ b/tests/all.py
@@ -164,8 +164,6 @@ glean_glsl_tests = [
                     'gl_FragDepth writing',
                     'chained assignment',
                     'cross() function, in-place',
-                    'conditional expression',
-                    'conditional expression (2)',
                     'sequence (comma) operator',
                     'constant array with constant indexing, fragment shader',
                     'temp array with constant indexing, fragment shader',
diff --git a/tests/glean/tglsl1.cpp b/tests/glean/tglsl1.cpp
index b536956..f743670 100644
--- a/tests/glean/tglsl1.cpp
+++ b/tests/glean/tglsl1.cpp
@@ -360,30 +360,6 @@ static const ShaderProgram Programs[] = {
 
 	// Flow Control ======================================================
 	{
-		"conditional expression",
-		NO_VERTEX_SHADER,
-		"void main() { \n"
-		"   gl_FragColor = gl_FragCoord.x < 0.0 ? vec4(0.0) : vec4(0.5); \n"
-		"} \n",
-		{ 0.5, 0.5, 0.5, 0.5 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
-		"conditional expression (2)",
-		NO_VERTEX_SHADER,
-		"void main() { \n"
-		"   gl_FragColor = vec4(0.0); \n"
-		"   bool b = true; \n"
-		"   gl_FragColor.y = b ? 1.0 : 0.5; \n"
-		"} \n",
-		{ 0.0, 1.0, 0.0, 0.0 },
-		DONT_CARE_Z,
-		FLAG_NONE
-	},
-
-	{
 		"sequence (comma) operator",
 		NO_VERTEX_SHADER,
 		"void main() { \n"
-- 
1.8.5.5