Remove GLES2-texture.wrap tests from mustpass

Bug:25719831
Test uses a pixel-by-pixel diff to compare against a threshold.
Will remove from mustpass

Change-Id: Icb61c821c3822cb57f5917e6a2a154375c372058

diff --git a/android/cts/master/com.drawelements.deqp.gles2.xml b/android/cts/master/com.drawelements.deqp.gles2.xml
index 3b83015..cdab584 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.gles2.xml
+++ b/android/cts/master/com.drawelements.deqp.gles2.xml
@@ -26583,9 +26583,6 @@
                                        <Test name="clamp_clamp_nearest_pot_rgb888">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="clamp_clamp_nearest_pot_rgba4444">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="clamp_clamp_nearest_pot_l8">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
@@ -26655,9 +26652,6 @@
                                        <Test name="repeat_mirror_nearest_pot_rgb888">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="repeat_mirror_nearest_pot_rgba4444">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="repeat_mirror_nearest_pot_l8">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
@@ -26691,57 +26685,30 @@
                                        <Test name="mirror_mirror_linear_pot_rgba8888">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="clamp_clamp_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="clamp_clamp_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="clamp_repeat_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="clamp_repeat_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="clamp_mirror_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="clamp_mirror_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="repeat_clamp_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="repeat_clamp_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="repeat_repeat_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="repeat_repeat_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="repeat_mirror_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="repeat_mirror_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="mirror_clamp_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="mirror_clamp_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="mirror_repeat_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="mirror_repeat_linear_pot_etc1">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="mirror_mirror_nearest_pot_etc1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="mirror_mirror_linear_pot_etc1">
                                                <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 fd9c201..c85cca6 100644 (file)
--- a/android/cts/master/gles2-master.txt
+++ b/android/cts/master/gles2-master.txt
@@ -8675,7 +8675,6 @@ dEQP-GLES2.functional.texture.size.cube.512x512_rgba8888
 dEQP-GLES2.functional.texture.size.cube.512x512_rgba8888_mipmap
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba4444
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_l8
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgba8888
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_npot_rgb888
@@ -8699,7 +8698,6 @@ dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.repeat_repeat_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgb888
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba4444
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_l8
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_rgb888
@@ -8711,23 +8709,14 @@ dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.mirror_repeat_linear_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_rgba8888
 dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_rgba8888
-dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.clamp_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.clamp_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.clamp_mirror_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.repeat_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.repeat_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.repeat_mirror_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.mirror_clamp_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.mirror_repeat_linear_pot_etc1
-dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_etc1
 dEQP-GLES2.functional.texture.wrap.mirror_mirror_linear_pot_etc1
 dEQP-GLES2.functional.texture.filtering.2d.nearest_mipmap_nearest_linear_clamp_etc1
 dEQP-GLES2.functional.texture.filtering.2d.linear_mipmap_nearest_linear_clamp_etc1

diff --git a/android/cts/master/src/gles2-test-issues.txt b/android/cts/master/src/gles2-test-issues.txt
index 3af2795..8ceee2f 100644 (file)
--- a/android/cts/master/src/gles2-test-issues.txt
+++ b/android/cts/master/src/gles2-test-issues.txt
@@ -11,3 +11,16 @@ dEQP-GLES2.functional.dither.disabled.gradient_alpha
 
 #Bug 25720457
 dEQP-GLES2.functional.texture.units.2_units.only_cube.9
+
+# Bug 25719831
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.clamp_clamp_nearest_pot_rgba4444
+dEQP-GLES2.functional.texture.wrap.clamp_mirror_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.clamp_repeat_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.mirror_clamp_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.mirror_mirror_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.mirror_repeat_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.repeat_clamp_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_etc1
+dEQP-GLES2.functional.texture.wrap.repeat_mirror_nearest_pot_rgba4444
+dEQP-GLES2.functional.texture.wrap.repeat_repeat_nearest_pot_etc1