Commit d696c208 authored by Jonah Ryan-Davis's avatar Jonah Ryan-Davis Committed by Commit Bot

Disable swangle passthrough webgl tests

Chrome expects libvulkan to be statically linked within ANGLE, so
these tests were failing. Wait until we update the build to statically
link before we re-enable these tests.

Bug: angleproject:4477
Change-Id: Ia5f5f3ac6dd0f210b7770be2863b4d1174143cd9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2106566
Commit-Queue: Jonah Ryan-Davis <jonahr@google.com>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#751142}
parent 3a5a600b
This diff is collapsed.
This diff is collapsed.
...@@ -2300,13 +2300,6 @@ ...@@ -2300,13 +2300,6 @@
'Win10 FYI x64 Release (AMD RX 550)', 'Win10 FYI x64 Release (AMD RX 550)',
], ],
}, },
'webgl_conformance_swangle_passthrough_tests': {
'remove_from': [
# Disable tests on ASAN builds until libvulkan is statically linked:
# anglebug.com/4477
'Mac FYI GPU ASAN Release',
],
},
'webgl_conformance_tests': { 'webgl_conformance_tests': {
'modifications': { 'modifications': {
# On desktop platforms these don't take very long (~7 minutes), # On desktop platforms these don't take very long (~7 minutes),
......
...@@ -2534,22 +2534,6 @@ ...@@ -2534,22 +2534,6 @@
}, },
}, },
'gpu_webgl_conformance_swangle_passthrough_telemetry_tests': {
'webgl_conformance_swangle_passthrough': {
'telemetry_test_name': 'webgl_conformance',
'args': [
# On dual-GPU devices we want the high-performance GPU to be active
'--extra-browser-args=--use-gl=angle --use-angle=swiftshader --use-cmd-decoder=passthrough --force_high_performance_gpu',
# We are only interested in running a 'smoketest' to test swangle
# integration, not the full conformance suite.
'--test-filter=conformance/rendering/gl-drawelements.html',
],
'swarming': {
'shards': 1,
},
},
},
'gpu_webgl_conformance_telemetry_tests': { 'gpu_webgl_conformance_telemetry_tests': {
'webgl_conformance': { 'webgl_conformance': {
'chromeos_args': [ 'chromeos_args': [
...@@ -4140,7 +4124,6 @@ ...@@ -4140,7 +4124,6 @@
'gpu_webgl2_conformance_telemetry_tests', 'gpu_webgl2_conformance_telemetry_tests',
'gpu_webgl_conformance_telemetry_tests', 'gpu_webgl_conformance_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_swangle_passthrough_telemetry_tests',
], ],
'gpu_angle_perf_smoke_isolated_scripts_and_test_buildbucket_api_gpu_use_cases': [ 'gpu_angle_perf_smoke_isolated_scripts_and_test_buildbucket_api_gpu_use_cases': [
...@@ -4302,7 +4285,6 @@ ...@@ -4302,7 +4285,6 @@
'gpu_webgl2_conformance_validating_telemetry_tests', 'gpu_webgl2_conformance_validating_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_validating_telemetry_tests', 'gpu_webgl_conformance_validating_telemetry_tests',
'gpu_webgl_conformance_swangle_passthrough_telemetry_tests',
], ],
'gpu_fyi_optional_linux_telemetry_tests': [ 'gpu_fyi_optional_linux_telemetry_tests': [
...@@ -4315,7 +4297,6 @@ ...@@ -4315,7 +4297,6 @@
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_webgl2_conformance_validating_telemetry_tests', 'gpu_webgl2_conformance_validating_telemetry_tests',
'gpu_webgl_conformance_gl_passthrough_telemetry_tests', 'gpu_webgl_conformance_gl_passthrough_telemetry_tests',
'gpu_webgl_conformance_swangle_passthrough_telemetry_tests',
# Not currently running # Not currently running
# gpu_webgl2_conformance_gl_passthrough_telemetry_tests here due # gpu_webgl2_conformance_gl_passthrough_telemetry_tests here due
# to concerns about machine capacity. # to concerns about machine capacity.
......
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