Commit 35d4c584 authored by Kenneth Russell's avatar Kenneth Russell

Stop running WebGL 2.0 conformance on AMD on win_angle_rel_ng.

There aren't enough Windows AMD machines to run this test suite on AMD
GPUs against all ANGLE CLs. The suite runs on NVIDIA and Intel GPUs,
and the AMD-specific version doesn't catch many errors at this point,
so accept the potential for waterfall-only failures.

Bug: 854698
Tbr: geofflang@chromium.org
Change-Id: Ifaacd8f559ab339bde24d345548fdf5257d6082e
Reviewed-on: https://chromium-review.googlesource.com/1112766Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Cr-Commit-Position: refs/heads/master@{#570166}
parent 81446466
...@@ -14994,31 +14994,6 @@ ...@@ -14994,31 +14994,6 @@
} }
], ],
"isolated_scripts": [ "isolated_scripts": [
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc",
"--webgl-conformance-version=2.0.1",
"--read-abbreviated-json-results-from=../../content/test/data/gpu/webgl2_conformance_tests_output.json"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl2_conformance_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Windows-2008ServerR2-SP1",
"pool": "Chrome-GPU"
}
],
"shards": 20
}
},
{ {
"args": [ "args": [
"webgl_conformance", "webgl_conformance",
......
...@@ -1451,7 +1451,7 @@ ...@@ -1451,7 +1451,7 @@
}, },
}, },
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests': { 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests': {
'webgl2_conformance_tests': { 'webgl2_conformance_tests': {
'telemetry_test_name': 'webgl_conformance', 'telemetry_test_name': 'webgl_conformance',
'args': [ 'args': [
...@@ -2604,19 +2604,19 @@ ...@@ -2604,19 +2604,19 @@
'gpu_fyi_mac_release_telemetry_tests': [ 'gpu_fyi_mac_release_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
], ],
'gpu_fyi_optional_linux_telemetry_tests': [ 'gpu_fyi_optional_linux_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests', 'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
], ],
'gpu_fyi_optional_telemetry_tests': [ 'gpu_fyi_optional_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
], ],
'gpu_fyi_win_and_linux_intel_and_nvidia_release_telemetry_tests': [ 'gpu_fyi_win_and_linux_intel_and_nvidia_release_telemetry_tests': [
...@@ -2624,7 +2624,7 @@ ...@@ -2624,7 +2624,7 @@
'gpu_default_win_and_linux_specific_telemetry_tests', 'gpu_default_win_and_linux_specific_telemetry_tests',
'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests', 'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests',
'gpu_fyi_only_win_linux_intel_nvidia_specific_telemetry_tests', 'gpu_fyi_only_win_linux_intel_nvidia_specific_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
], ],
...@@ -2632,7 +2632,7 @@ ...@@ -2632,7 +2632,7 @@
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_default_win_and_linux_specific_telemetry_tests', 'gpu_default_win_and_linux_specific_telemetry_tests',
'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests', 'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
], ],
...@@ -2673,7 +2673,7 @@ ...@@ -2673,7 +2673,7 @@
'gpu_fyi_and_optional_win_specific_gpu_telemetry_tests', 'gpu_fyi_and_optional_win_specific_gpu_telemetry_tests',
'gpu_fyi_only_win_linux_intel_nvidia_specific_telemetry_tests', 'gpu_fyi_only_win_linux_intel_nvidia_specific_telemetry_tests',
'gpu_fyi_only_win_nvidia_release_specific_telemetry_tests', 'gpu_fyi_only_win_nvidia_release_specific_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
], ],
...@@ -2692,7 +2692,7 @@ ...@@ -2692,7 +2692,7 @@
'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests', 'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests',
'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests', 'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests',
'gpu_fyi_and_optional_win_specific_gpu_telemetry_tests', 'gpu_fyi_and_optional_win_specific_gpu_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
], ],
...@@ -2714,7 +2714,7 @@ ...@@ -2714,7 +2714,7 @@
'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests', 'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests',
'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests', 'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests',
'gpu_fyi_and_optional_win_specific_gpu_telemetry_tests', 'gpu_fyi_and_optional_win_specific_gpu_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
], ],
...@@ -2723,12 +2723,12 @@ ...@@ -2723,12 +2723,12 @@
'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests', 'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests',
'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests', 'gpu_fyi_and_optional_win_and_linux_specific_telemetry_tests',
'gpu_fyi_and_optional_win_specific_gpu_telemetry_tests', 'gpu_fyi_and_optional_win_specific_gpu_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
], ],
'gpu_v8_desktop_telemetry_tests': [ 'gpu_v8_desktop_telemetry_tests': [
'gpu_common_and_optional_telemetry_tests', 'gpu_common_and_optional_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests', 'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
'gpu_telemetry_tests', 'gpu_telemetry_tests',
], ],
...@@ -2739,7 +2739,6 @@ ...@@ -2739,7 +2739,6 @@
'gpu_win_angle_amd_telemetry_tests': [ 'gpu_win_angle_amd_telemetry_tests': [
'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests', 'gpu_fyi_and_optional_and_win_angle_amd_win_specific_gpu_telemetry_tests',
'gpu_fyi_optional_v8_and_win_angle_amd_desktop_release_specific_telemetry_tests',
], ],
'gpu_win_gtests': [ 'gpu_win_gtests': [
......
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