Remove a few ES2 tests from mustpass

Bug: 21208276
Change-Id: Ib5815fca3c002cf2ef58c8d7255bda807ff7e5fb

3 files changed, 17 insertions, 65 deletions

diff --git a/android/cts/master/com.drawelements.deqp.gles2.xml b/android/cts/master/com.drawelements.deqp.gles2.xml
index e9ad5519c..25337e694 100644
--- a/android/cts/master/com.drawelements.deqp.gles2.xml
+++ b/android/cts/master/com.drawelements.deqp.gles2.xml
@@ -1481,12 +1481,6 @@
 						<Test name="unopened_parenthesis_fragment">
 							<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 						</Test>
-						<Test name="unclosed_parenthesis_vertex">
-							<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-						</Test>
-						<Test name="unclosed_parenthesis_fragment">
-							<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-						</Test>
 					</TestCase>
 					<TestCase name="operator_precedence">
 						<Test name="modulo_vs_not_vertex">
@@ -27063,12 +27057,6 @@
 							<Test name="la88_nicest">
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 							</Test>
-							<Test name="la88_non_square_fastest">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-							</Test>
-							<Test name="la88_non_square_nicest">
-								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-							</Test>
 							<Test name="rgb565_fastest">
 								<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 							</Test>
@@ -35788,9 +35776,6 @@
 					<Test name="bind_buffer">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="gen_buffers">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 					<Test name="buffer_data">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
@@ -35809,12 +35794,6 @@
 					<Test name="check_framebuffer_status">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="gen_framebuffers">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
-					<Test name="gen_renderbuffers">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 				</TestCase>
 				<TestCase name="fragment">
 					<Test name="scissor">
@@ -36216,9 +36195,6 @@
 					<Test name="generatemipmap_incomplete_cube">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="gentextures_invalid_size">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 					<Test name="pixelstorei_invalid_pname">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
@@ -36231,9 +36207,6 @@
 					<Test name="teximage2d_invalid_type">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="teximage2d_inequal_width_height_cube">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 					<Test name="teximage2d_neg_level_tex2d">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
@@ -36544,18 +36517,12 @@
 					<Test name="vec3">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="vec4">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 					<Test name="mat2">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="mat3">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="mat4">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 				</TestCase>
 				<TestCase name="bind_aliasing">
 					<Test name="max_inactive_float">
@@ -36567,18 +36534,12 @@
 					<Test name="max_inactive_vec3">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="max_inactive_vec4">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 					<Test name="max_inactive_mat2">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
 					<Test name="max_inactive_mat3">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="max_inactive_mat4">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 				</TestCase>
 				<TestCase name="bind_hole">
 					<Test name="float">
@@ -36590,15 +36551,9 @@
 					<Test name="vec3">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="mat2">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 					<Test name="mat3">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="mat4">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 				</TestCase>
 				<TestCase name="bind_time">
 					<Test name="pre_attach">
@@ -41144,9 +41099,6 @@
 					<Test name="program_attached_shaders">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
-					<Test name="program_active_uniform_name">
-						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-					</Test>
 					<Test name="program_active_uniform_types">
 						<TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
 					</Test>
diff --git a/android/cts/master/gles2-master.txt b/android/cts/master/gles2-master.txt
index fa383498d..e2002370f 100644
--- a/android/cts/master/gles2-master.txt
+++ b/android/cts/master/gles2-master.txt
@@ -466,8 +466,6 @@ dEQP-GLES2.functional.shaders.preprocessor.invalid_expressions.invalid_expr_3_ve
 dEQP-GLES2.functional.shaders.preprocessor.invalid_expressions.invalid_expr_3_fragment
 dEQP-GLES2.functional.shaders.preprocessor.invalid_expressions.unopened_parenthesis_vertex
 dEQP-GLES2.functional.shaders.preprocessor.invalid_expressions.unopened_parenthesis_fragment
-dEQP-GLES2.functional.shaders.preprocessor.invalid_expressions.unclosed_parenthesis_vertex
-dEQP-GLES2.functional.shaders.preprocessor.invalid_expressions.unclosed_parenthesis_fragment
 dEQP-GLES2.functional.shaders.preprocessor.operator_precedence.modulo_vs_not_vertex
 dEQP-GLES2.functional.shaders.preprocessor.operator_precedence.modulo_vs_not_fragment
 dEQP-GLES2.functional.shaders.preprocessor.operator_precedence.div_vs_not_vertex
@@ -8831,8 +8829,6 @@ dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_fastest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_nicest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_fastest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_nicest
-dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_fastest
-dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_nicest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.rgb565_fastest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.rgb565_nicest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.rgb565_non_square_fastest
@@ -11674,15 +11670,12 @@ dEQP-GLES2.functional.shader_api.program_state.recompile_shader_fragment
 dEQP-GLES2.functional.shader_api.program_state.replace_source_vertex
 dEQP-GLES2.functional.shader_api.program_state.replace_source_fragment
 dEQP-GLES2.functional.negative_api.buffer.bind_buffer
-dEQP-GLES2.functional.negative_api.buffer.gen_buffers
 dEQP-GLES2.functional.negative_api.buffer.buffer_data
 dEQP-GLES2.functional.negative_api.buffer.buffer_sub_data
 dEQP-GLES2.functional.negative_api.buffer.buffer_sub_data_size_offset
 dEQP-GLES2.functional.negative_api.buffer.bind_framebuffer
 dEQP-GLES2.functional.negative_api.buffer.bind_renderbuffer
 dEQP-GLES2.functional.negative_api.buffer.check_framebuffer_status
-dEQP-GLES2.functional.negative_api.buffer.gen_framebuffers
-dEQP-GLES2.functional.negative_api.buffer.gen_renderbuffers
 dEQP-GLES2.functional.negative_api.fragment.scissor
 dEQP-GLES2.functional.negative_api.fragment.depth_func
 dEQP-GLES2.functional.negative_api.fragment.viewport
@@ -11814,12 +11807,10 @@ dEQP-GLES2.functional.negative_api.texture.copytexsubimage2d_offset_allowed
 dEQP-GLES2.functional.negative_api.texture.copytexsubimage2d_neg_wdt_hgt
 dEQP-GLES2.functional.negative_api.texture.generatemipmap_invalid_target
 dEQP-GLES2.functional.negative_api.texture.generatemipmap_incomplete_cube
-dEQP-GLES2.functional.negative_api.texture.gentextures_invalid_size
 dEQP-GLES2.functional.negative_api.texture.pixelstorei_invalid_pname
 dEQP-GLES2.functional.negative_api.texture.pixelstorei_invalid_param
 dEQP-GLES2.functional.negative_api.texture.teximage2d_invalid_target
 dEQP-GLES2.functional.negative_api.texture.teximage2d_invalid_type
-dEQP-GLES2.functional.negative_api.texture.teximage2d_inequal_width_height_cube
 dEQP-GLES2.functional.negative_api.texture.teximage2d_neg_level_tex2d
 dEQP-GLES2.functional.negative_api.texture.teximage2d_neg_level_cube
 dEQP-GLES2.functional.negative_api.texture.teximage2d_level_max_tex2d
@@ -11916,23 +11907,17 @@ dEQP-GLES2.functional.attribute_location.bind.mat4
 dEQP-GLES2.functional.attribute_location.bind_max_attributes.float
 dEQP-GLES2.functional.attribute_location.bind_max_attributes.vec2
 dEQP-GLES2.functional.attribute_location.bind_max_attributes.vec3
-dEQP-GLES2.functional.attribute_location.bind_max_attributes.vec4
 dEQP-GLES2.functional.attribute_location.bind_max_attributes.mat2
 dEQP-GLES2.functional.attribute_location.bind_max_attributes.mat3
-dEQP-GLES2.functional.attribute_location.bind_max_attributes.mat4
 dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_float
 dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_vec2
 dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_vec3
-dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_vec4
 dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_mat2
 dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_mat3
-dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_mat4
 dEQP-GLES2.functional.attribute_location.bind_hole.float
 dEQP-GLES2.functional.attribute_location.bind_hole.vec2
 dEQP-GLES2.functional.attribute_location.bind_hole.vec3
-dEQP-GLES2.functional.attribute_location.bind_hole.mat2
 dEQP-GLES2.functional.attribute_location.bind_hole.mat3
-dEQP-GLES2.functional.attribute_location.bind_hole.mat4
 dEQP-GLES2.functional.attribute_location.bind_time.pre_attach
 dEQP-GLES2.functional.attribute_location.bind_time.pre_link
 dEQP-GLES2.functional.attribute_location.bind_time.post_link
@@ -13380,7 +13365,6 @@ dEQP-GLES2.functional.state_query.shader.current_vertex_attrib_float
 dEQP-GLES2.functional.state_query.shader.current_vertex_attrib_float_to_int
 dEQP-GLES2.functional.state_query.shader.program_validate_status
 dEQP-GLES2.functional.state_query.shader.program_attached_shaders
-dEQP-GLES2.functional.state_query.shader.program_active_uniform_name
 dEQP-GLES2.functional.state_query.shader.program_active_uniform_types
 dEQP-GLES2.functional.state_query.shader.active_attributes
 dEQP-GLES2.functional.state_query.shader.vertex_attrib_size
diff --git a/android/cts/master/src/gles2-failures.txt b/android/cts/master/src/gles2-failures.txt
index c1ab595fd..ec7671e65 100644
--- a/android/cts/master/src/gles2-failures.txt
+++ b/android/cts/master/src/gles2-failures.txt
@@ -15,7 +15,13 @@ dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_mat4
 dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_vec2
 dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_vec3
 dEQP-GLES2.functional.attribute_location.bind_aliasing.max_cond_vec4
+dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_mat4
+dEQP-GLES2.functional.attribute_location.bind_aliasing.max_inactive_vec4
+dEQP-GLES2.functional.attribute_location.bind_hole.mat2
+dEQP-GLES2.functional.attribute_location.bind_hole.mat4
 dEQP-GLES2.functional.attribute_location.bind_hole.vec4
+dEQP-GLES2.functional.attribute_location.bind_max_attributes.mat4
+dEQP-GLES2.functional.attribute_location.bind_max_attributes.vec4
 dEQP-GLES2.functional.attribute_location.bind_relink_hole.float
 dEQP-GLES2.functional.attribute_location.bind_relink_hole.mat2
 dEQP-GLES2.functional.attribute_location.bind_relink_hole.mat3
@@ -781,6 +787,9 @@ dEQP-GLES2.functional.negative_api.buffer.delete_framebuffers
 dEQP-GLES2.functional.negative_api.buffer.delete_renderbuffers
 dEQP-GLES2.functional.negative_api.buffer.framebuffer_renderbuffer
 dEQP-GLES2.functional.negative_api.buffer.framebuffer_texture2d
+dEQP-GLES2.functional.negative_api.buffer.gen_buffers
+dEQP-GLES2.functional.negative_api.buffer.gen_framebuffers
+dEQP-GLES2.functional.negative_api.buffer.gen_renderbuffers
 dEQP-GLES2.functional.negative_api.buffer.read_pixels
 dEQP-GLES2.functional.negative_api.buffer.read_pixels_format_mismatch
 dEQP-GLES2.functional.negative_api.buffer.renderbuffer_storage
@@ -818,6 +827,8 @@ dEQP-GLES2.functional.negative_api.texture.deletetextures_invalid_number
 dEQP-GLES2.functional.negative_api.texture.deletetextures_invalid_number_bind
 dEQP-GLES2.functional.negative_api.texture.generatemipmap_npot_wdt_hgt
 dEQP-GLES2.functional.negative_api.texture.generatemipmap_zero_level_array_compressed
+dEQP-GLES2.functional.negative_api.texture.gentextures_invalid_size
+dEQP-GLES2.functional.negative_api.texture.teximage2d_inequal_width_height_cube
 dEQP-GLES2.functional.negative_api.texture.teximage2d_invalid_format
 dEQP-GLES2.functional.negative_api.texture.teximage2d_invalid_internalformat
 dEQP-GLES2.functional.negative_api.texture.texsubimage2d_invalid_format
@@ -1909,6 +1920,8 @@ dEQP-GLES2.functional.shaders.preprocessor.invalid_conditionals.tokens_after_end
 dEQP-GLES2.functional.shaders.preprocessor.invalid_conditionals.tokens_after_endif_vertex
 dEQP-GLES2.functional.shaders.preprocessor.invalid_definitions.undef_non_identifier_2_fragment
 dEQP-GLES2.functional.shaders.preprocessor.invalid_definitions.undef_non_identifier_2_vertex
+dEQP-GLES2.functional.shaders.preprocessor.invalid_expressions.unclosed_parenthesis_fragment
+dEQP-GLES2.functional.shaders.preprocessor.invalid_expressions.unclosed_parenthesis_vertex
 dEQP-GLES2.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_2_fragment
 dEQP-GLES2.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_2_vertex
 dEQP-GLES2.functional.shaders.preprocessor.object_redefinitions.redefine_object_1_fragment
@@ -1941,11 +1954,11 @@ dEQP-GLES2.functional.shaders.preprocessor.operator_precedence.mul_vs_plus_fragm
 dEQP-GLES2.functional.shaders.preprocessor.operator_precedence.mul_vs_plus_vertex
 dEQP-GLES2.functional.shaders.preprocessor.operator_precedence.xor_vs_bitwise_and_fragment
 dEQP-GLES2.functional.shaders.preprocessor.operator_precedence.xor_vs_bitwise_and_vertex
+dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_fragment
 dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_unrecognized_debug_fragment
 dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_unrecognized_debug_vertex
 dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_unrecognized_token_fragment
 dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_unrecognized_token_vertex
-dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_fragment
 dEQP-GLES2.functional.shaders.preprocessor.pragmas.pragma_vertex
 dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_fragment
 dEQP-GLES2.functional.shaders.preprocessor.predefined_macros.line_2_vertex
@@ -2326,6 +2339,7 @@ dEQP-GLES2.functional.state_query.integers.stencil_value_mask_separate_both_getf
 dEQP-GLES2.functional.state_query.integers.stencil_value_mask_separate_getfloat
 dEQP-GLES2.functional.state_query.rbo.renderbuffer_internal_format
 dEQP-GLES2.functional.state_query.rbo.renderbuffer_size
+dEQP-GLES2.functional.state_query.shader.program_active_uniform_name
 dEQP-GLES2.functional.state_query.shader.program_info_log_length
 dEQP-GLES2.functional.state_query.shader.shader_info_log_length
 dEQP-GLES2.functional.state_query.shader.shader_source_length
@@ -2556,6 +2570,8 @@ dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_non_square_fastest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.a8_non_square_nicest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_non_square_fastest
 dEQP-GLES2.functional.texture.mipmap.2d.generate.l8_non_square_nicest
+dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_fastest
+dEQP-GLES2.functional.texture.mipmap.2d.generate.la88_non_square_nicest
 dEQP-GLES2.functional.texture.mipmap.2d.projected.linear_linear_clamp
 dEQP-GLES2.functional.texture.mipmap.2d.projected.linear_linear_mirror
 dEQP-GLES2.functional.texture.mipmap.2d.projected.linear_linear_repeat