dEQP: Add override for ES2 Color Clear Test.

This test has a bug where the masked clear flag is not being set properly, leading to incorrect test behaviour and missing coverage. Until this bug is fixed in dEQP we can override it with a fixed version. Also remove a prior override that had an upstreamed fix. Bug: angleproject:2455 Change-Id: Ia2c57251b2a97eb5b4d8a4bdb0ce31796a66ea01 Reviewed-on: https://chromium-review.googlesource.com/1013859Reviewed-by: Frank Henigman <fjhenigman@chromium.org> Reviewed-by: Luc Ferron <lucferron@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

dEQP: Add override for ES2 Color Clear Test.
eeec3b14 · Jamie Madill · Commit Bot · aaa19de0 · eeec3b14 · eeec3b14
Commit eeec3b14 authored Apr 16, 2018 by Jamie Madill Committed by Commit Bot Apr 19, 2018
4 changed files
--- a/src/tests/deqp.gypi
+++ b/src/tests/deqp.gypi
@@ -135,7 +135,10 @@
            '<(deqp_path)/modules/gles2/functional/es2fBufferWriteTests.hpp',
            '<(deqp_path)/modules/gles2/functional/es2fClippingTests.cpp',
            '<(deqp_path)/modules/gles2/functional/es2fClippingTests.hpp',
-            '<(deqp_path)/modules/gles2/functional/es2fColorClearTest.cpp',
+            # Work around a bug in this test by using a local override.
+            # TODO(jmadill): Restore after rolling dEQP.
+            #'<(deqp_path)/modules/gles2/functional/es2fColorClearTest.cpp',
+            '<(angle_path)/src/tests/deqp_support/es2fColorClearTest.cpp',
            '<(deqp_path)/modules/gles2/functional/es2fColorClearTest.hpp',
            '<(deqp_path)/modules/gles2/functional/es2fDebugMarkerTests.cpp',
            '<(deqp_path)/modules/gles2/functional/es2fDebugMarkerTests.hpp',
@@ -1114,8 +1117,7 @@
            '<(deqp_path)/framework/qphelper/qpCrashHandler.c',
            '<(deqp_path)/framework/qphelper/qpDebugOut.c',
            '<(deqp_path)/framework/qphelper/qpInfo.c',
-            # TODO(jmadill): Restore this when we upstream the change.
+            '<(deqp_path)/framework/qphelper/qpTestLog.c',
-            #'<(deqp_path)/framework/qphelper/qpTestLog.c',
            '<(deqp_path)/framework/qphelper/qpWatchDog.c',
            '<(deqp_path)/framework/qphelper/qpXmlWriter.c',
            '<(deqp_path)/framework/randomshaders/rsgBinaryOps.cpp',
@@ -1184,8 +1186,6 @@
            '<(deqp_path)/modules/glshared/glsTextureTestUtil.cpp',
            '<(deqp_path)/modules/glshared/glsUniformBlockCase.cpp',
            '<(deqp_path)/modules/glshared/glsVertexArrayTests.cpp',
-            # TODO(jmadill): Remove this when we upstream the change.
-            '<(angle_path)/src/tests/deqp_support/qpTestLog.c',
            '<(angle_path)/src/tests/deqp_support/tcuANGLENativeDisplayFactory.cpp',
            '<(angle_path)/src/tests/deqp_support/tcuANGLENativeDisplayFactory.h',
            # TODO(jmadill): integrate with dEQP

--- a/src/tests/deqp_support/deqp_gles2_test_expectations.txt
+++ b/src/tests/deqp_support/deqp_gles2_test_expectations.txt
@@ -188,9 +188,10 @@
 1028 WIN LINUX MAC : dEQP-GLES2.functional.fbo.completeness.renderable.texture.depth.srgb8 = FAIL
 // Vulkan failures
-2455 VULKAN : dEQP-GLES2.functional.color_clear.masked_scissor* = SKIP
+2455 VULKAN : dEQP-GLES2.functional.color_clear.masked_rg* = FAIL
-2161 VULKAN : dEQP-GLES2.functional.color_clear.complex_* = SKIP
+2455 VULKAN : dEQP-GLES2.functional.color_clear.masked_scissor* = FAIL
-2161 VULKAN : dEQP-GLES2.functional.color_clear.long_masked_* = SKIP
+2455 VULKAN : dEQP-GLES2.functional.color_clear.complex_* = FAIL
+2455 VULKAN : dEQP-GLES2.functional.color_clear.long_masked_* = FAIL
 2161 VULKAN : dEQP-GLES2.functional.prerequisite.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.implementation_limits.* = SKIP
 2161 VULKAN : dEQP-GLES2.functional.buffer.* = SKIP

--- a/src/tests/deqp_support/es2fColorClearTest.cpp
+++ b/src/tests/deqp_support/es2fColorClearTest.cpp
--- a/src/tests/deqp_support/qpTestLog.c
+++ b/src/tests/deqp_support/qpTestLog.c