Remove multiwindow EGL tests from mustpass.

Bug: 26953953
Change-Id: Ie2a8712f0f28cc390a97bd5fe7ef5fa10db03c5a

diff --git a/android/cts/master/com.drawelements.deqp.egl.xml b/android/cts/master/com.drawelements.deqp.egl.xml
index 2d57fae..dd0fc89 100644 (file)
--- a/android/cts/master/com.drawelements.deqp.egl.xml
+++ b/android/cts/master/com.drawelements.deqp.egl.xml
@@ -7567,9 +7567,6 @@
                                <Test name="pixmap">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
-                               <Test name="window">
-                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                               </Test>
                                <Test name="single_window">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
@@ -7579,54 +7576,33 @@
                                <Test name="pbuffer_pixmap">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
-                               <Test name="pbuffer_window">
-                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                               </Test>
                                <Test name="pbuffer_single_window">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
                                <Test name="pbuffer_context">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
-                               <Test name="pixmap_window">
-                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                               </Test>
                                <Test name="pixmap_single_window">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
                                <Test name="pixmap_context">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
-                               <Test name="window_context">
-                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                               </Test>
                                <Test name="single_window_context">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
-                               <Test name="pbuffer_pixmap_window">
-                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                               </Test>
                                <Test name="pbuffer_pixmap_single_window">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
                                <Test name="pbuffer_pixmap_context">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
-                               <Test name="pbuffer_window_context">
-                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                               </Test>
                                <Test name="pbuffer_single_window_context">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
-                               <Test name="pixmap_window_context">
-                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                               </Test>
                                <Test name="pixmap_single_window_context">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>
-                               <Test name="pbuffer_pixmap_window_context">
-                                       <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
-                               </Test>
                                <Test name="pbuffer_pixmap_single_window_context">
                                        <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
                                </Test>

diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index 87398d9..2f76b88 100644 (file)
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -2390,26 +2390,18 @@ dEQP-EGL.functional.fence_sync.invalid.wait_server_invalid_flag
 dEQP-EGL.functional.multithread.config
 dEQP-EGL.functional.multithread.pbuffer
 dEQP-EGL.functional.multithread.pixmap
-dEQP-EGL.functional.multithread.window
 dEQP-EGL.functional.multithread.single_window
 dEQP-EGL.functional.multithread.context
 dEQP-EGL.functional.multithread.pbuffer_pixmap
-dEQP-EGL.functional.multithread.pbuffer_window
 dEQP-EGL.functional.multithread.pbuffer_single_window
 dEQP-EGL.functional.multithread.pbuffer_context
-dEQP-EGL.functional.multithread.pixmap_window
 dEQP-EGL.functional.multithread.pixmap_single_window
 dEQP-EGL.functional.multithread.pixmap_context
-dEQP-EGL.functional.multithread.window_context
 dEQP-EGL.functional.multithread.single_window_context
-dEQP-EGL.functional.multithread.pbuffer_pixmap_window
 dEQP-EGL.functional.multithread.pbuffer_pixmap_single_window
 dEQP-EGL.functional.multithread.pbuffer_pixmap_context
-dEQP-EGL.functional.multithread.pbuffer_window_context
 dEQP-EGL.functional.multithread.pbuffer_single_window_context
-dEQP-EGL.functional.multithread.pixmap_window_context
 dEQP-EGL.functional.multithread.pixmap_single_window_context
-dEQP-EGL.functional.multithread.pbuffer_pixmap_window_context
 dEQP-EGL.functional.multithread.pbuffer_pixmap_single_window_context
 dEQP-EGL.functional.get_proc_address.extension.egl_android_blob_cache
 dEQP-EGL.functional.get_proc_address.extension.egl_android_native_fence_sync

diff --git a/android/cts/master/src/egl-test-issues.txt b/android/cts/master/src/egl-test-issues.txt
new file mode 100644 (file)
index 0000000..7b0b25a
--- /dev/null
+++ b/android/cts/master/src/egl-test-issues.txt
@@ -0,0 +1,9 @@
+# Bug: 26953953
+dEQP-EGL.functional.multithread.window
+dEQP-EGL.functional.multithread.pbuffer_window
+dEQP-EGL.functional.multithread.pixmap_window
+dEQP-EGL.functional.multithread.window_context
+dEQP-EGL.functional.multithread.pbuffer_pixmap_window
+dEQP-EGL.functional.multithread.pixmap_window_context
+dEQP-EGL.functional.multithread.pbuffer_window_context
+dEQP-EGL.functional.multithread.pbuffer_pixmap_window_context

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