Commit 111535d3 authored by Sunny Sachanandani's avatar Sunny Sachanandani Committed by Commit Bot

Restore webgl conformance ANGLE D3D11 backend coverage on FYI waterfall

crrev.com/c/1939845 accidentally removed ANGLE D3D11 backend coverage
for webgl conformance tests because of a naming confusion.  This CL
restores that coverage by undoing the removal of the default variant
(D3D11 on Windows) of webgl_conformance_telemetry_tests and
webgl2_conformance_telemetry_tests.

Bug: 1028850, 1032768
Change-Id: I04f8542fcb124c0082af97cca6d0487af7803e3f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1961129Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Sunny Sachanandani <sunnyps@chromium.org>
Cr-Commit-Position: refs/heads/master@{#723647}
parent 47d21cd2
This diff is collapsed.
...@@ -5635,8 +5635,10 @@ ...@@ -5635,8 +5635,10 @@
'gpu_angle_win_intel_nvidia_telemetry_tests': [ 'gpu_angle_win_intel_nvidia_telemetry_tests': [
'gpu_info_collection_telemetry_tests', 'gpu_info_collection_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests', 'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
], ],
...@@ -5806,6 +5808,7 @@ ...@@ -5806,6 +5808,7 @@
'gpu_telemetry_tests', 'gpu_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests', 'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
], ],
...@@ -5826,8 +5829,10 @@ ...@@ -5826,8 +5829,10 @@
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests', 'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
'gpu_win_intel_specific_telemetry_tests', 'gpu_win_intel_specific_telemetry_tests',
], ],
...@@ -5835,9 +5840,10 @@ ...@@ -5835,9 +5840,10 @@
'gpu_fyi_win_nvidia_amd_release_telemetry_tests': [ 'gpu_fyi_win_nvidia_amd_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests', 'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
], ],
...@@ -5855,8 +5861,10 @@ ...@@ -5855,8 +5861,10 @@
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl2_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests', 'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
], ],
...@@ -5876,18 +5884,20 @@ ...@@ -5876,18 +5884,20 @@
'gpu_optional_win_intel_telemetry_tests': [ 'gpu_optional_win_intel_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests', 'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
'gpu_win_intel_specific_telemetry_tests', 'gpu_win_intel_specific_telemetry_tests',
], ],
'gpu_optional_win_telemetry_tests': [ 'gpu_optional_win_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_webgl2_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests', 'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
], ],
...@@ -5911,7 +5921,7 @@ ...@@ -5911,7 +5921,7 @@
'gpu_win_angle_amd_telemetry_tests': [ 'gpu_win_angle_amd_telemetry_tests': [
'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests', 'gpu_webgl_conformance_d3d9_passthrough_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests', 'gpu_webgl_conformance_vulkan_passthrough_telemetry_tests',
], ],
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment