Remove double underscore cases from mr1 must-pass list.

Bug: 18357013
Change-Id: If7c76f9b4374a83657280df7dbfcc23673210f0d

diff --git a/android/cts/com.drawelements.deqp.gles3.xml b/android/cts/com.drawelements.deqp.gles3.xml
index ea5aa5c..cb9c2ca 100644 (file)
--- a/android/cts/com.drawelements.deqp.gles3.xml
+++ b/android/cts/com.drawelements.deqp.gles3.xml
@@ -926,8 +926,6 @@
 <Test name="redefine_object_multiline_comment_fragment" />
 </TestCase>
 <TestCase name="invalid_redefinitions">
-<Test name="invalid_identifier_1_vertex" />
-<Test name="invalid_identifier_1_fragment" />
 <Test name="invalid_identifier_2_vertex" />
 <Test name="invalid_identifier_2_fragment" />
 </TestCase>
@@ -4263,12 +4261,6 @@
 <Test name="using_fragment" />
 </TestCase>
 <TestCase name="invalid_identifiers">
-<Test name="two_underscores_begin_vertex" />
-<Test name="two_underscores_begin_fragment" />
-<Test name="two_underscores_middle_vertex" />
-<Test name="two_underscores_middle_fragment" />
-<Test name="two_underscores_end_vertex" />
-<Test name="two_underscores_end_fragment" />
 <Test name="gl_begin_vertex" />
 <Test name="gl_begin_fragment" />
 <Test name="digit_vertex" />

diff --git a/android/cts/es30-lmp-mr1.txt b/android/cts/es30-lmp-mr1.txt
index e237e03..c012f45 100644 (file)
--- a/android/cts/es30-lmp-mr1.txt
+++ b/android/cts/es30-lmp-mr1.txt
@@ -842,8 +842,6 @@ dEQP-GLES3.functional.shaders.preprocessor.object_redefinitions.redefine_object_
 dEQP-GLES3.functional.shaders.preprocessor.object_redefinitions.redefine_object_comment_fragment
 dEQP-GLES3.functional.shaders.preprocessor.object_redefinitions.redefine_object_multiline_comment_vertex
 dEQP-GLES3.functional.shaders.preprocessor.object_redefinitions.redefine_object_multiline_comment_fragment
-dEQP-GLES3.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_1_vertex
-dEQP-GLES3.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_1_fragment
 dEQP-GLES3.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_2_vertex
 dEQP-GLES3.functional.shaders.preprocessor.invalid_redefinitions.invalid_identifier_2_fragment
 dEQP-GLES3.functional.shaders.preprocessor.comments.multiline_comment_define_vertex
@@ -4043,12 +4041,6 @@ dEQP-GLES3.functional.shaders.keywords.reserved_keywords.namespace_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.namespace_fragment
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.using_vertex
 dEQP-GLES3.functional.shaders.keywords.reserved_keywords.using_fragment
-dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.two_underscores_begin_vertex
-dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.two_underscores_begin_fragment
-dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.two_underscores_middle_vertex
-dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.two_underscores_middle_fragment
-dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.two_underscores_end_vertex
-dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.two_underscores_end_fragment
 dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.gl_begin_vertex
 dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.gl_begin_fragment
 dEQP-GLES3.functional.shaders.keywords.invalid_identifiers.digit_vertex