Remove tests using internal Android APIs from EGL mustpass

Change-Id: I39d156909ba0b38788acb2e1d7a52db727264378

diff --git a/android/cts/master/com.drawelements.deqp.egl.xml b/android/cts/master/com.drawelements.deqp.egl.xml
index 47f672b..2a50d43 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.egl.xml
+++ b/android/cts/master/com.drawelements.deqp.egl.xml
@@ -3010,21 +3010,6 @@
                                        <Test name="create_image_gles2_renderbuffer_stencil_index8">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="create_image_gles2_android_native_rgb565">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="create_image_gles2_android_native_rgb8">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="create_image_gles2_android_native_rgba4">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="create_image_gles2_android_native_rgb5_a1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="create_image_gles2_android_native_rgba8">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                        <Test name="image_target_gles2_tex2d">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
@@ -3159,36 +3144,6 @@
                                        <Test name="gles2_renderbuffer_stencil_stencil_buffer">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="gles2_android_native_rgb565_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb565_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb8_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb8_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgba4_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgba4_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb5_a1_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb5_a1_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgba8_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgba8_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                </TestCase>
                                <TestCase name="modify">
                                        <Test name="tex_rgb8_tex_subimage_rgb8">
@@ -3284,60 +3239,6 @@
                                        <Test name="renderbuffer_stencil_renderbuffer_clear_stencil">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="android_native_rgb565_tex_subimage_rgb8">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb565_tex_subimage_rgb565">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb565_renderbuffer_clear_color">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb8_tex_subimage_rgb8">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb8_tex_subimage_rgb565">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb8_renderbuffer_clear_color">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgba4_tex_subimage_rgba8">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgba4_tex_subimage_rgba5_a1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgba4_tex_subimage_rgba4">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgba4_renderbuffer_clear_color">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb5_a1_tex_subimage_rgba8">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb5_a1_tex_subimage_rgba5_a1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb5_a1_tex_subimage_rgba4">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgb5_a1_renderbuffer_clear_color">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgba8_tex_subimage_rgba8">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgba8_tex_subimage_rgba5_a1">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgba8_tex_subimage_rgba4">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="android_native_rgba8_renderbuffer_clear_color">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                </TestCase>
                                <TestCase name="render_multiple_contexts">
                                        <Test name="gles2_texture_rgb8_texture">
@@ -3466,36 +3367,6 @@
                                        <Test name="gles2_renderbuffer_stencil_stencil_buffer">
                                                <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                        </Test>
-                                       <Test name="gles2_android_native_rgb565_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb565_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb8_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb8_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgba4_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgba4_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb5_a1_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgb5_a1_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgba8_texture">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
-                                       <Test name="gles2_android_native_rgba8_read_pixels">
-                                               <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                                       </Test>
                                </TestCase>
                        </TestSuite>
                        <TestSuite name="sharing">

diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index df9f6cd..04fb6d4 100644 (file)
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -946,11 +946,6 @@ dEQP-EGL.functional.image.api.create_image_gles2_renderbuffer_rgba4
 dEQP-EGL.functional.image.api.create_image_gles2_renderbuffer_rgb5_a1
 dEQP-EGL.functional.image.api.create_image_gles2_renderbuffer_rgb565
 dEQP-EGL.functional.image.api.create_image_gles2_renderbuffer_stencil_index8
-dEQP-EGL.functional.image.api.create_image_gles2_android_native_rgb565
-dEQP-EGL.functional.image.api.create_image_gles2_android_native_rgb8
-dEQP-EGL.functional.image.api.create_image_gles2_android_native_rgba4
-dEQP-EGL.functional.image.api.create_image_gles2_android_native_rgb5_a1
-dEQP-EGL.functional.image.api.create_image_gles2_android_native_rgba8
 dEQP-EGL.functional.image.api.image_target_gles2_tex2d
 dEQP-EGL.functional.image.api.image_target_gles2_renderbuffer
 dEQP-EGL.functional.image.create.gles2_texture_rgb8_texture
@@ -995,16 +990,6 @@ dEQP-EGL.functional.image.create.gles2_renderbuffer_rgb565_texture
 dEQP-EGL.functional.image.create.gles2_renderbuffer_rgb565_read_pixels
 dEQP-EGL.functional.image.create.gles2_renderbuffer_depth16_depth_buffer
 dEQP-EGL.functional.image.create.gles2_renderbuffer_stencil_stencil_buffer
-dEQP-EGL.functional.image.create.gles2_android_native_rgb565_texture
-dEQP-EGL.functional.image.create.gles2_android_native_rgb565_read_pixels
-dEQP-EGL.functional.image.create.gles2_android_native_rgb8_texture
-dEQP-EGL.functional.image.create.gles2_android_native_rgb8_read_pixels
-dEQP-EGL.functional.image.create.gles2_android_native_rgba4_texture
-dEQP-EGL.functional.image.create.gles2_android_native_rgba4_read_pixels
-dEQP-EGL.functional.image.create.gles2_android_native_rgb5_a1_texture
-dEQP-EGL.functional.image.create.gles2_android_native_rgb5_a1_read_pixels
-dEQP-EGL.functional.image.create.gles2_android_native_rgba8_texture
-dEQP-EGL.functional.image.create.gles2_android_native_rgba8_read_pixels
 dEQP-EGL.functional.image.modify.tex_rgb8_tex_subimage_rgb8
 dEQP-EGL.functional.image.modify.tex_rgb8_tex_subimage_rgb565
 dEQP-EGL.functional.image.modify.tex_rgb8_renderbuffer_clear_color
@@ -1036,24 +1021,6 @@ dEQP-EGL.functional.image.modify.renderbuffer_rgb565_tex_subimage_rgb565
 dEQP-EGL.functional.image.modify.renderbuffer_rgb565_renderbuffer_clear_color
 dEQP-EGL.functional.image.modify.renderbuffer_depth16_renderbuffer_clear_depth
 dEQP-EGL.functional.image.modify.renderbuffer_stencil_renderbuffer_clear_stencil
-dEQP-EGL.functional.image.modify.android_native_rgb565_tex_subimage_rgb8
-dEQP-EGL.functional.image.modify.android_native_rgb565_tex_subimage_rgb565
-dEQP-EGL.functional.image.modify.android_native_rgb565_renderbuffer_clear_color
-dEQP-EGL.functional.image.modify.android_native_rgb8_tex_subimage_rgb8
-dEQP-EGL.functional.image.modify.android_native_rgb8_tex_subimage_rgb565
-dEQP-EGL.functional.image.modify.android_native_rgb8_renderbuffer_clear_color
-dEQP-EGL.functional.image.modify.android_native_rgba4_tex_subimage_rgba8
-dEQP-EGL.functional.image.modify.android_native_rgba4_tex_subimage_rgba5_a1
-dEQP-EGL.functional.image.modify.android_native_rgba4_tex_subimage_rgba4
-dEQP-EGL.functional.image.modify.android_native_rgba4_renderbuffer_clear_color
-dEQP-EGL.functional.image.modify.android_native_rgb5_a1_tex_subimage_rgba8
-dEQP-EGL.functional.image.modify.android_native_rgb5_a1_tex_subimage_rgba5_a1
-dEQP-EGL.functional.image.modify.android_native_rgb5_a1_tex_subimage_rgba4
-dEQP-EGL.functional.image.modify.android_native_rgb5_a1_renderbuffer_clear_color
-dEQP-EGL.functional.image.modify.android_native_rgba8_tex_subimage_rgba8
-dEQP-EGL.functional.image.modify.android_native_rgba8_tex_subimage_rgba5_a1
-dEQP-EGL.functional.image.modify.android_native_rgba8_tex_subimage_rgba4
-dEQP-EGL.functional.image.modify.android_native_rgba8_renderbuffer_clear_color
 dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgb8_texture
 dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgb8_read_pixels
 dEQP-EGL.functional.image.render_multiple_contexts.gles2_texture_rgb565_texture
@@ -1096,16 +1063,6 @@ dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_rgb565_tex
 dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_rgb565_read_pixels
 dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_depth16_depth_buffer
 dEQP-EGL.functional.image.render_multiple_contexts.gles2_renderbuffer_stencil_stencil_buffer
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgb565_texture
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgb565_read_pixels
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgb8_texture
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgb8_read_pixels
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgba4_texture
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgba4_read_pixels
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgb5_a1_texture
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgb5_a1_read_pixels
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgba8_texture
-dEQP-EGL.functional.image.render_multiple_contexts.gles2_android_native_rgba8_read_pixels
 dEQP-EGL.functional.sharing.gles2.context.create_destroy
 dEQP-EGL.functional.sharing.gles2.context.create_destroy_mixed
 dEQP-EGL.functional.sharing.gles2.buffer.create_delete

diff --git a/android/cts/master/src/egl-internal-api-tests.txt b/android/cts/master/src/egl-internal-api-tests.txt
new file mode 100644 (file)
index 0000000..b923046
--- /dev/null
+++ b/android/cts/master/src/egl-internal-api-tests.txt
@@ -0,0 +1 @@
+dEQP-EGL.functional.image.*.*android_native*

diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 69245eb..aec4d3c 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -199,7 +199,7 @@ MNC_GLES31_PKG                                      = Package(module = GLES31_MODULE, configurations = [
 
 # Master
 
-MASTER_EGL_COMMON_FILTERS              = [include("egl-master.txt")]
+MASTER_EGL_COMMON_FILTERS              = [include("egl-master.txt"), exclude("egl-internal-api-tests.txt")]
 MASTER_EGL_PKG                                 = Package(module = EGL_MODULE, configurations = [
                # Master
                Configuration(name                      = "master",