Revert "DO NOT MERGE: Temporarily disable failing deqp tests"

This reverts commit 82e66a88f0bc8e5450360410720d076170a6d2e9.

diff --git a/android/cts/master/egl-master.txt b/android/cts/master/egl-master.txt
index 38a2d64..d3b76c1 100644 (file)
--- a/android/cts/master/egl-master.txt
+++ b/android/cts/master/egl-master.txt
@@ -3573,6 +3573,26 @@ dEQP-EGL.functional.get_frame_timestamps.other
 dEQP-EGL.functional.robustness.create_context.query_robust_access
 dEQP-EGL.functional.robustness.create_context.no_reset_notification
 dEQP-EGL.functional.robustness.create_context.lose_context_on_reset
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.vertex
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.vertex_and_fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.reset_status.compute
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.vertex
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.vertex_and_fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.sync_status.compute
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.vertex
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.vertex_and_fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.query_status.compute
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.vertex_and_fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.shared_context_status.compute
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.recover_from_reset.vertex
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.recover_from_reset.fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.recover_from_reset.vertex_and_fragment
+dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.recover_from_reset.compute
 dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds.reset_status.reads.uniform_block.vertex
 dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds.reset_status.reads.uniform_block.fragment
 dEQP-EGL.functional.robustness.reset_context.shaders.out_of_bounds.reset_status.reads.uniform_block.vertex_and_fragment

diff --git a/android/cts/master/gles3-master.txt b/android/cts/master/gles3-master.txt
index e6e0ab5..37e6728 100644 (file)
--- a/android/cts/master/gles3-master.txt
+++ b/android/cts/master/gles3-master.txt
@@ -36414,6 +36414,7 @@ dEQP-GLES3.functional.pbo.renderbuffer.rgba4_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgba4_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_clears
+dEQP-GLES3.functional.pbo.renderbuffer.rgb565_clears
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rg8_triangles

diff --git a/android/cts/master/gles3-rotate-landscape.txt b/android/cts/master/gles3-rotate-landscape.txt
index 1e01f46..36693fe 100644 (file)
--- a/android/cts/master/gles3-rotate-landscape.txt
+++ b/android/cts/master/gles3-rotate-landscape.txt
@@ -520,6 +520,7 @@ dEQP-GLES3.functional.pbo.renderbuffer.rgba4_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgba4_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_clears
+dEQP-GLES3.functional.pbo.renderbuffer.rgb565_clears
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rg8_triangles

diff --git a/android/cts/master/gles3-rotate-portrait.txt b/android/cts/master/gles3-rotate-portrait.txt
index 1e01f46..36693fe 100644 (file)
--- a/android/cts/master/gles3-rotate-portrait.txt
+++ b/android/cts/master/gles3-rotate-portrait.txt
@@ -520,6 +520,7 @@ dEQP-GLES3.functional.pbo.renderbuffer.rgba4_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgba4_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_clears
+dEQP-GLES3.functional.pbo.renderbuffer.rgb565_clears
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rg8_triangles

diff --git a/android/cts/master/gles3-rotate-reverse-landscape.txt b/android/cts/master/gles3-rotate-reverse-landscape.txt
index 1e01f46..36693fe 100644 (file)
--- a/android/cts/master/gles3-rotate-reverse-landscape.txt
+++ b/android/cts/master/gles3-rotate-reverse-landscape.txt
@@ -520,6 +520,7 @@ dEQP-GLES3.functional.pbo.renderbuffer.rgba4_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgba4_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_clears
+dEQP-GLES3.functional.pbo.renderbuffer.rgb565_clears
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rg8_triangles

diff --git a/android/cts/master/gles3-rotate-reverse-portrait.txt b/android/cts/master/gles3-rotate-reverse-portrait.txt
index 1e01f46..36693fe 100644 (file)
--- a/android/cts/master/gles3-rotate-reverse-portrait.txt
+++ b/android/cts/master/gles3-rotate-reverse-portrait.txt
@@ -520,6 +520,7 @@ dEQP-GLES3.functional.pbo.renderbuffer.rgba4_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgba4_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.rgb8_clears
+dEQP-GLES3.functional.pbo.renderbuffer.rgb565_clears
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_triangles
 dEQP-GLES3.functional.pbo.renderbuffer.r11f_g11f_b10f_clears
 dEQP-GLES3.functional.pbo.renderbuffer.rg8_triangles

diff --git a/android/cts/master/src/egl-temporary-exclusions.txt b/android/cts/master/src/egl-temporary-exclusions.txt
deleted file mode 100644 (file)
index 4d17e6c..0000000
--- a/android/cts/master/src/egl-temporary-exclusions.txt
+++ /dev/null
@@ -1 +0,0 @@
-dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.*

diff --git a/android/cts/master/src/gles3-temporary-exclusions.txt b/android/cts/master/src/gles3-temporary-exclusions.txt
deleted file mode 100644 (file)
index b3989f3..0000000
--- a/android/cts/master/src/gles3-temporary-exclusions.txt
+++ /dev/null
@@ -1 +0,0 @@
-dEQP-GLES3.functional.pbo.renderbuffer.rgb565_clears

diff --git a/android/cts/master/src/vk-temporary-exclusions.txt b/android/cts/master/src/vk-temporary-exclusions.txt
deleted file mode 100644 (file)
index 24011a9..0000000
--- a/android/cts/master/src/vk-temporary-exclusions.txt
+++ /dev/null
@@ -1 +0,0 @@
-dEQP-VK.ubo.random.all_shared_buffer.48

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 08c4cc5..4ab9f31 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -130897,6 +130897,7 @@ dEQP-VK.ubo.random.all_shared_buffer.44
 dEQP-VK.ubo.random.all_shared_buffer.45
 dEQP-VK.ubo.random.all_shared_buffer.46
 dEQP-VK.ubo.random.all_shared_buffer.47
+dEQP-VK.ubo.random.all_shared_buffer.48
 dEQP-VK.ubo.random.all_shared_buffer.49
 dEQP-VK.ubo.random.all_out_of_order_offsets.0
 dEQP-VK.ubo.random.all_out_of_order_offsets.1

diff --git a/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index 12bd36c..e2e8815 100644 (file)
--- a/scripts/build_android_mustpass.py
+++ b/scripts/build_android_mustpass.py
@@ -346,8 +346,7 @@ NYC_VULKAN_PKG                                      = Package(module = VULKAN_MODULE, configurations = [
 MASTER_EGL_COMMON_FILTERS              = [include("egl-master.txt"),
                                                                   exclude("egl-test-issues.txt"),
                                                                   exclude("egl-internal-api-tests.txt"),
-                                                                  exclude("egl-manual-robustness.txt"),
-                                                                  exclude("egl-temporary-exclusions.txt")]
+                                                                  exclude("egl-manual-robustness.txt")]
 MASTER_EGL_PKG                                 = Package(module = EGL_MODULE, configurations = [
                # Master
                Configuration(name                      = "master",
@@ -380,8 +379,7 @@ MASTER_GLES3_COMMON_FILTERS         = [
                exclude("gles3-hw-issues.txt"),
                exclude("gles3-driver-issues.txt"),
                exclude("gles3-test-issues.txt"),
-               exclude("gles3-spec-issues.txt"),
-               exclude("gles3-temporary-exclusions.txt")
+               exclude("gles3-spec-issues.txt")
        ]
 MASTER_GLES3_PKG                               = Package(module = GLES3_MODULE, configurations = [
                # Master
@@ -442,7 +440,7 @@ MASTER_GLES31_COMMON_FILTERS        = [
                exclude("gles31-hw-issues.txt"),
                exclude("gles31-driver-issues.txt"),
                exclude("gles31-test-issues.txt"),
-               exclude("gles31-spec-issues.txt")
+               exclude("gles31-spec-issues.txt"),
        ]
 MASTER_GLES31_PKG                              = Package(module = GLES31_MODULE, configurations = [
                # Master
@@ -502,7 +500,6 @@ MASTER_VULKAN_FILTERS                       = [
                exclude("vk-not-applicable.txt"),
                exclude("vk-excluded-tests.txt"),
                exclude("vk-test-issues.txt"),
-               exclude("vk-temporary-exclusions.txt")
        ]
 MASTER_VULKAN_PKG                              = Package(module = VULKAN_MODULE, configurations = [
                Configuration(name                      = "master",