Update mustpass to exclude buffer_age test
Change-Id: I465e4646356818fa12cacf6cf68a536de3d61ece
diff --git a/android/cts/master/com.drawelements.deqp.egl.xml b/android/cts/master/com.drawelements.deqp.egl.xml
index b86d1c1..e2cf0ff 100644
--- a/android/cts/master/com.drawelements.deqp.egl.xml
+++ b/android/cts/master/com.drawelements.deqp.egl.xml
@@ -6919,180 +6919,6 @@
</Test>
</TestCase>
</TestSuite>
- <TestSuite name="buffer_age">
- <TestCase name="preserve">
- <Test name="odd_none_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_clear_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_clear_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_clear_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_clear_even_clear_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_clear_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_clear_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_clear_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_render_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_render_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_render_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_clear_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_clear_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_render_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- </TestCase>
- <TestCase name="no_preserve">
- <Test name="odd_none_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_clear_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_none">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_clear_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_clear_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_clear_even_clear_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_clear_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_clear_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_clear_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_render_even_render_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_render_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_render_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_clear_render_even_clear_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_clear_render">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- <Test name="odd_render_clear_even_render_clear">
- <TestInstance glconfig="rgba8888d24s8ms0" rotation="unspecified" surfacetype="window"/>
- </Test>
- </TestCase>
- </TestSuite>
</TestSuite>
</TestSuite>
</TestPackage>
diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index 4b87f0c..93fe8b9 100644
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -2163,59 +2163,3 @@
dEQP-EGL.functional.resize.surface_size.grow
dEQP-EGL.functional.resize.surface_size.stretch_width
dEQP-EGL.functional.resize.surface_size.stretch_height
-dEQP-EGL.functional.buffer_age.preserve.odd_none_even_none
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_even_none
-dEQP-EGL.functional.buffer_age.preserve.odd_render_even_none
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_clear_even_none
-dEQP-EGL.functional.buffer_age.preserve.odd_render_render_even_none
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_render_even_none
-dEQP-EGL.functional.buffer_age.preserve.odd_render_clear_even_none
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_even_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_render_even_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_clear_even_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_render_render_even_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_render_even_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_render_clear_even_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_render_even_render
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_clear_even_render
-dEQP-EGL.functional.buffer_age.preserve.odd_render_render_even_render
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_render_even_render
-dEQP-EGL.functional.buffer_age.preserve.odd_render_clear_even_render
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_clear_even_clear_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_render_render_even_clear_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_render_even_clear_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_render_clear_even_clear_clear
-dEQP-EGL.functional.buffer_age.preserve.odd_render_render_even_render_render
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_render_even_render_render
-dEQP-EGL.functional.buffer_age.preserve.odd_render_clear_even_render_render
-dEQP-EGL.functional.buffer_age.preserve.odd_clear_render_even_clear_render
-dEQP-EGL.functional.buffer_age.preserve.odd_render_clear_even_clear_render
-dEQP-EGL.functional.buffer_age.preserve.odd_render_clear_even_render_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_none_even_none
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_even_none
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_even_none
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_clear_even_none
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_render_even_none
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_render_even_none
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_clear_even_none
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_even_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_even_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_clear_even_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_render_even_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_render_even_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_clear_even_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_even_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_clear_even_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_render_even_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_render_even_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_clear_even_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_clear_even_clear_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_render_even_clear_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_render_even_clear_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_clear_even_clear_clear
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_render_even_render_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_render_even_render_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_clear_even_render_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_clear_render_even_clear_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_clear_even_clear_render
-dEQP-EGL.functional.buffer_age.no_preserve.odd_render_clear_even_render_clear
diff --git a/android/cts/master/src/egl-new-tests.txt b/android/cts/master/src/egl-new-tests.txt
new file mode 100644
index 0000000..b340d09
--- /dev/null
+++ b/android/cts/master/src/egl-new-tests.txt
@@ -0,0 +1,2 @@
+# Feature Request 20761474
+dEQP-EGL.functional.buffer_age.*
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index e3708c3..e69fc77 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -404,7 +404,7 @@
filters = [include("es31-lmp-mr1.txt")]),
])
-MASTER_EGL_COMMON_FILTERS = [include("egl-master.txt"), exclude("egl-failures.txt")]
+MASTER_EGL_COMMON_FILTERS = [include("egl-master.txt"), exclude("egl-failures.txt"), exclude("egl-new-tests.txt")]
MASTER_EGL_PKG = Package(module = EGL_MODULE, configurations = [
# Master
Configuration(name = "master",