Convert negative pragma cases to positive.

- Convert negative #pragma debug and invalid token cases to expect
  successful compile.
- Rename tests to match new behavior and remove cases from mustpass.

Bug: 21725534
Change-Id: I4cb06d3038b551eb21b52f14dd341bb59519d38c

diff --git a/android/cts/master/com.drawelements.deqp.gles3.xml b/android/cts/master/com.drawelements.deqp.gles3.xml
index e0ecc54..d1236ae 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles3.xml
+++ b/android/cts/master/com.drawelements.deqp.gles3.xml
@@ -3773,18 +3773,6 @@
                                                <Test name="pragma_macro_exp_fragment">
                                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                                </Test>
-                                               <Test name="invalid_pragma_invalid_debug_vertex">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="invalid_pragma_invalid_debug_fragment">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="invalid_pragma_invalid_token_vertex">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
-                                               <Test name="invalid_pragma_invalid_token_fragment">
-                                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                               </Test>
                                        </TestCase>
                                        <TestCase name="extensions">
                                                <Test name="basic_vertex">

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index dfce400..e52148f 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -1143,10 +1143,6 @@ dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_vertex
 dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_fragment
 dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_macro_exp_vertex
 dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_macro_exp_fragment
-dEQP-GLES3.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_debug_vertex
-dEQP-GLES3.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_debug_fragment
-dEQP-GLES3.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_token_vertex
-dEQP-GLES3.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_token_fragment
 dEQP-GLES3.functional.shaders.preprocessor.extensions.basic_vertex
 dEQP-GLES3.functional.shaders.preprocessor.extensions.basic_fragment
 dEQP-GLES3.functional.shaders.preprocessor.extensions.macro_exp_vertex

diff --git a/android/cts/master/src/gles2-failures.txt b/android/cts/master/src/gles2-failures.txt
index 74c0b72..c1ab595 100644 (file)
--- a/android/cts/master/src/gles2-failures.txt
+++ b/android/cts/master/src/gles2-failures.txt
@@ -1941,10 +1941,10 @@ 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.invalid_pragma_invalid_debug_fragment
-dEQP-GLES2.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_debug_vertex
-dEQP-GLES2.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_token_fragment
-dEQP-GLES2.functional.shaders.preprocessor.pragmas.invalid_pragma_invalid_token_vertex
+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

diff --git a/android/cts/master/src/gles3-test-issues.txt b/android/cts/master/src/gles3-test-issues.txt
index 220d3d4..c03cf6e 100644 (file)
--- a/android/cts/master/src/gles3-test-issues.txt
+++ b/android/cts/master/src/gles3-test-issues.txt
@@ -64,3 +64,7 @@ dEQP-GLES3.functional.shaders.texture_functions.textureprojlodoffset.usampler3d_
 
 # Bug 21620051
 dEQP-GLES3.functional.shaders.texture_functions.texture.sampler2darrayshadow_vertex
+
+# Bug 21725534
+dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_unrecognized_debug_*
+dEQP-GLES3.functional.shaders.preprocessor.pragmas.pragma_unrecognized_token_*

diff --git a/data/gles2/shaders/preprocessor.test b/data/gles2/shaders/preprocessor.test
index 6aeb5e1..d2dc32b 100644 (file)
--- a/data/gles2/shaders/preprocessor.test
+++ b/data/gles2/shaders/preprocessor.test
@@ -2719,11 +2719,13 @@ group pragmas "Pragma Tests"
                ""
        end
 
-       case invalid_pragma_invalid_debug
-               expect compile_fail
+       case pragma_unrecognized_debug
+               expect build_successful
                both ""
                        #pragma debug(1.23)
 
+                       // unrecognized preprocessor token
+
                        precision mediump float;
                        void main()
                        {
@@ -2732,11 +2734,13 @@ group pragmas "Pragma Tests"
                ""
        end
 
-       case invalid_pragma_invalid_token
-               expect compile_fail
+       case pragma_unrecognized_token
+               expect build_successful
                both ""
                        #pragma ¤¤½
 
+                       // trailing bytes form a valid but unrecognized preprocessor token
+
                        precision mediump float;
                        void main()
                        {

diff --git a/data/gles3/shaders/preprocessor.test b/data/gles3/shaders/preprocessor.test
index ed5e1f9..12e0d8c 100644 (file)
--- a/data/gles3/shaders/preprocessor.test
+++ b/data/gles3/shaders/preprocessor.test
@@ -3287,13 +3287,15 @@ group pragmas "Pragma Tests"
                ""
        end
 
-       case invalid_pragma_invalid_debug
+       case pragma_unrecognized_debug
                version 300 es
-               expect compile_fail
+               expect build_successful
                both ""
                        #version 300 es
                        #pragma debug(1.23)
 
+                       // unrecognized preprocessor token
+
                        precision mediump float;
                        ${DECLARATIONS}
                        void main()
@@ -3303,13 +3305,15 @@ group pragmas "Pragma Tests"
                ""
        end
 
-       case invalid_pragma_invalid_token
+       case pragma_unrecognized_token
                version 300 es
-               expect compile_fail
+               expect build_successful
                both ""
                        #version 300 es
                        #pragma ¤¤½
 
+                       // trailing bytes form a valid but unrecognized preprocessor token
+
                        precision mediump float;
                        ${DECLARATIONS}
                        void main()