Remove a few preprocessor cases testing undefined behavior

Bug: 27126954
Change-Id: I1ee7ca0c0102b6273b1bc165b3d1ad24cee449e2

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index 76ef6b4..5e19de4 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -3211,12 +3211,6 @@
                                                <Test name="basic_2_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="defined_macro_defined_test_vertex">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="defined_macro_defined_test_fragment">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                                <Test name="defined_macro_undef_vertex">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index 6b535ab..9980ae0 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -956,8 +956,6 @@ dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_1_vertex
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_1_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2_vertex
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.basic_2_fragment
-dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_defined_test_vertex
-dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_defined_test_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef_vertex
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_undef_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_invalid_before_all_macros_replaced_vertex

diff --git a/android/cts/master/src/gles3-spec-issues.txt b/android/cts/master/src/gles3-spec-issues.txt
index ad1f008..2b7cf96 100644 (file)
--- a/android/cts/master/src/gles3-spec-issues.txt
+++ b/android/cts/master/src/gles3-spec-issues.txt
@@ -525,3 +525,5 @@ dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_fragment
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_outside_if_vertex
 dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.define_defined_outside_if_fragment
+dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_defined_test_fragment
+dEQP-GLES3.functional.shaders.preprocessor.conditional_inclusion.defined_macro_defined_test_vertex