am 694c96fd: Merge "Document GLES2 texture size failures."
* commit '694c96fdcf9e885402d476922e5a9ee5f871551f':
Document GLES2 texture size failures.
diff --git a/android/cts/master/src/gles2-failures.txt b/android/cts/master/src/gles2-failures.txt
index 74c0b72..79a56a2 100644
--- a/android/cts/master/src/gles2-failures.txt
+++ b/android/cts/master/src/gles2-failures.txt
@@ -2585,9 +2585,7 @@
dEQP-GLES2.functional.texture.size.cube.15x15_rgba4444
dEQP-GLES2.functional.texture.size.cube.15x15_rgba8888
dEQP-GLES2.functional.texture.size.cube.16x16_l8_mipmap
-dEQP-GLES2.functional.texture.size.cube.256x256_rgba4444
dEQP-GLES2.functional.texture.size.cube.256x256_rgba4444_mipmap
-dEQP-GLES2.functional.texture.size.cube.512x512_rgba4444
dEQP-GLES2.functional.texture.size.cube.512x512_rgba4444_mipmap
dEQP-GLES2.functional.texture.specification.teximage2d_align.cube_l8_63_1
dEQP-GLES2.functional.texture.specification.teximage2d_align.cube_l8_63_2
diff --git a/android/cts/master/src/gles2-test-issues.txt b/android/cts/master/src/gles2-test-issues.txt
new file mode 100644
index 0000000..eb826ed
--- /dev/null
+++ b/android/cts/master/src/gles2-test-issues.txt
@@ -0,0 +1,3 @@
+# Bug 21526557
+dEQP-GLES2.functional.texture.size.cube.256x256_rgba4444
+dEQP-GLES2.functional.texture.size.cube.512x512_rgba4444
diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 3fd8ff7..5e7603d 100644
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -418,7 +418,11 @@
filters = MASTER_EGL_COMMON_FILTERS),
])
-MASTER_GLES2_COMMON_FILTERS = [include("gles2-master.txt"), exclude("gles2-failures.txt")]
+MASTER_GLES2_COMMON_FILTERS = [
+ include("gles2-master.txt"),
+ exclude("gles2-test-issues.txt"),
+ exclude("gles2-failures.txt")
+ ]
MASTER_GLES2_PKG = Package(module = GLES2_MODULE, configurations = [
# Master
Configuration(name = "master",