Restore infinite loop tests into the mustpass

Bug: 34887800
Bug: 37476650
Test: dEQP-EGL.functional.robustness.* on Angler, both ABIs
Change-Id: I7313d09ceb6d08ff67c05f573e9fb049de36061e
Merged-In: Id2b8e4366da75dcb1b3afdeaede325d3a34e3071

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/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/scripts/build_android_mustpass.py b/scripts/build_android_mustpass.py
index f211041..77ff629 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",