Commit dc7feeb8 authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot

testing/buildbot: Add fake Win ANGLE try bots.

These bots will be used to trigger tests on the ANGLE CQ.
Mirrors the design used in the existing files and in
http://crrev.com/c/1326157 .

Only tackles Windows for now. Will be extended to other platforms.

Also adds a few NVIDIA dEQP tests and cleans up some ANGLE test naming.

Bug: 822310
Change-Id: I5638bdc8588bdf3a4716fd45380ad25cc35ee121
Reviewed-on: https://chromium-review.googlesource.com/c/1333995Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#607911}
parent 9c744799
{ {
"AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {},
"AAAAA2 See generate_buildbot_json.py to make changes": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {},
"ANGLE GPU Win10 Release (Intel HD 630)": {
"gtest_tests": [
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-d3d11"
],
"name": "angle_deqp_gles2_d3d11_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_gles2_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "angle_gles1_conformance_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "angle_unittests"
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "angle_white_box_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--use-cmd-decoder=passthrough"
],
"name": "gl_tests_passthrough",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "gl_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--use-angle=d3d9"
],
"name": "gles2_conform_d3d9_test",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "gles2_conform_test"
},
{
"args": [
"--use-gpu-in-tests",
"--use-angle=gl",
"--disable-gpu-sandbox"
],
"name": "gles2_conform_gl_test",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "gles2_conform_test"
},
{
"args": [
"--use-angle=d3d9",
"--use-test-data-path",
"--test_video_data=test-25fps.h264:320:240:250:258:::1"
],
"name": "video_decode_accelerator_d3d9_unittest",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "video_decode_accelerator_unittest"
},
{
"args": [
"--use-angle=gl",
"--use-test-data-path",
"--test_video_data=test-25fps.h264:320:240:250:258:::1"
],
"name": "video_decode_accelerator_gl_unittest",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "video_decode_accelerator_unittest"
}
],
"isolated_scripts": [
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d11 --use-cmd-decoder=validating",
"--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_d3d11_validating_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 20
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough",
"--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_gl_passthrough_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 20
}
},
{
"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": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 20
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d11 --use-cmd-decoder=validating"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl_conformance_d3d11_validating_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 2
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d9 --use-cmd-decoder=passthrough"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl_conformance_d3d9_passthrough_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 2
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl_conformance_gl_passthrough_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 2
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=vulkan --use-cmd-decoder=passthrough"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl_conformance_vulkan_passthrough_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "8086:5912-24.20.100.6286",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 2
}
}
]
},
"ANGLE GPU Win10 Release (NVIDIA)": {
"gtest_tests": [
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-d3d11"
],
"name": "angle_deqp_egl_d3d11_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_egl_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-gl"
],
"name": "angle_deqp_egl_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_egl_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-vulkan"
],
"name": "angle_deqp_egl_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_egl_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-d3d11"
],
"name": "angle_deqp_gles2_d3d11_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_gles2_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-gl"
],
"name": "angle_deqp_gles2_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_gles2_tests"
},
{
"args": [
"--deqp-egl-display-type=angle-vulkan",
"--test-launcher-batch-limit=400"
],
"name": "angle_deqp_gles2_vulkan_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_gles2_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-d3d11"
],
"name": "angle_deqp_gles31_d3d11_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 6
},
"test": "angle_deqp_gles31_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-gl"
],
"name": "angle_deqp_gles31_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 6
},
"test": "angle_deqp_gles31_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-d3d11"
],
"name": "angle_deqp_gles3_d3d11_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 12
},
"test": "angle_deqp_gles3_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-gl"
],
"name": "angle_deqp_gles3_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 12
},
"test": "angle_deqp_gles3_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_end2end_tests"
},
{
"args": [
"--use-gpu-in-tests"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "angle_gles1_conformance_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "angle_unittests"
},
{
"args": [
"--test-launcher-retry-limit=0"
],
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "angle_white_box_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--use-cmd-decoder=passthrough"
],
"name": "gl_tests_passthrough",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "gl_tests"
},
{
"args": [
"--use-gpu-in-tests",
"--use-angle=d3d9"
],
"name": "gles2_conform_d3d9_test",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "gles2_conform_test"
},
{
"args": [
"--use-gpu-in-tests",
"--use-angle=gl",
"--disable-gpu-sandbox"
],
"name": "gles2_conform_gl_test",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "gles2_conform_test"
},
{
"args": [
"--use-angle=d3d9",
"--use-test-data-path",
"--test_video_data=test-25fps.h264:320:240:250:258:::1"
],
"name": "video_decode_accelerator_d3d9_unittest",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "video_decode_accelerator_unittest"
},
{
"args": [
"--use-angle=gl",
"--use-test-data-path",
"--test_video_data=test-25fps.h264:320:240:250:258:::1"
],
"name": "video_decode_accelerator_gl_unittest",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
},
"test": "video_decode_accelerator_unittest"
}
],
"isolated_scripts": [
{
"args": [
"-v",
"--one-frame-only"
],
"isolate_name": "angle_perftests",
"name": "angle_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
},
{
"args": [
"-v",
"--use-cmd-decoder=passthrough",
"--use-angle=gl-null",
"--fast-run"
],
"isolate_name": "command_buffer_perftests",
"name": "passthrough_command_buffer_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
},
{
"args": [
"-v",
"--use-cmd-decoder=validating",
"--use-stub",
"--fast-run"
],
"isolate_name": "command_buffer_perftests",
"name": "validating_command_buffer_perftests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
]
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d11 --use-cmd-decoder=validating",
"--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_d3d11_validating_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 20
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough",
"--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_gl_passthrough_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 20
}
},
{
"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": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 20
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d11 --use-cmd-decoder=validating"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl_conformance_d3d11_validating_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 2
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=d3d9 --use-cmd-decoder=passthrough"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl_conformance_d3d9_passthrough_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 2
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-gl=angle --use-angle=gl --use-cmd-decoder=passthrough"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl_conformance_gl_passthrough_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 2
}
},
{
"args": [
"webgl_conformance",
"--show-stdout",
"--browser=release",
"--passthrough",
"-v",
"--extra-browser-args=--enable-logging=stderr --js-flags=--expose-gc --use-angle=vulkan --use-cmd-decoder=passthrough"
],
"isolate_name": "telemetry_gpu_integration_test",
"name": "webgl_conformance_vulkan_passthrough_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"idempotent": false,
"shards": 2
}
}
]
},
"Android FYI 32 Vk Release (Nexus 5X)": { "Android FYI 32 Vk Release (Nexus 5X)": {
"gtest_tests": [ "gtest_tests": [
{ {
...@@ -17127,6 +18074,25 @@ ...@@ -17127,6 +18074,25 @@
}, },
"test": "angle_deqp_gles2_tests" "test": "angle_deqp_gles2_tests"
}, },
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-gl"
],
"name": "angle_deqp_gles2_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 4
},
"test": "angle_deqp_gles2_tests"
},
{ {
"args": [ "args": [
"--deqp-egl-display-type=angle-vulkan", "--deqp-egl-display-type=angle-vulkan",
...@@ -17202,6 +18168,25 @@ ...@@ -17202,6 +18168,25 @@
"shards": 12 "shards": 12
}, },
"test": "angle_deqp_gles3_tests" "test": "angle_deqp_gles3_tests"
},
{
"args": [
"--test-launcher-batch-limit=400",
"--deqp-egl-display-type=angle-gl"
],
"name": "angle_deqp_gles3_gl_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"gpu": "10de:1cb3-23.21.13.8816",
"os": "Windows-10",
"pool": "Chrome-GPU"
}
],
"shards": 12
},
"test": "angle_deqp_gles3_tests"
} }
] ]
}, },
......
...@@ -865,6 +865,10 @@ class BBJSONGenerator(object): ...@@ -865,6 +865,10 @@ class BBJSONGenerator(object):
# are defined only to be mirrored into trybots, and don't actually # are defined only to be mirrored into trybots, and don't actually
# exist on any of the waterfalls or consoles. # exist on any of the waterfalls or consoles.
return [ return [
'ANGLE GPU Win10 Release (Intel HD 630)',
'ANGLE GPU Win10 Release (NVIDIA)',
'Dawn GPU Win10 Release (Intel HD 630)',
'Dawn GPU Win10 Release (NVIDIA)',
'Optional Android Release (Nexus 5X)', 'Optional Android Release (Nexus 5X)',
'Optional Linux Release (Intel HD 630)', 'Optional Linux Release (Intel HD 630)',
'Optional Linux Release (NVIDIA)', 'Optional Linux Release (NVIDIA)',
...@@ -873,8 +877,6 @@ class BBJSONGenerator(object): ...@@ -873,8 +877,6 @@ class BBJSONGenerator(object):
'Optional Mac Retina Release (NVIDIA)', 'Optional Mac Retina Release (NVIDIA)',
'Optional Win10 Release (Intel HD 630)', 'Optional Win10 Release (Intel HD 630)',
'Optional Win10 Release (NVIDIA)', 'Optional Win10 Release (NVIDIA)',
'Dawn GPU Win10 Release (Intel HD 630)',
'Dawn GPU Win10 Release (NVIDIA)',
'Win7 ANGLE Tryserver (AMD)', 'Win7 ANGLE Tryserver (AMD)',
# chromium.fyi # chromium.fyi
'linux-blink-rel-dummy', 'linux-blink-rel-dummy',
......
...@@ -1237,6 +1237,20 @@ ...@@ -1237,6 +1237,20 @@
}, },
}, },
'gpu_angle_end2end_tests': {
'angle_end2end_tests': {
'desktop_args': [
'--use-gpu-in-tests',
# ANGLE test retries deliberately disabled to prevent flakiness.
# http://crbug.com/669196
'--test-launcher-retry-limit=0'
],
'swarming': {
'shards': 4,
},
},
},
'gpu_angle_fyi_and_optional_win_specific_isolated_scripts': { 'gpu_angle_fyi_and_optional_win_specific_isolated_scripts': {
# TODO(jmadill): Run on Linux bots when possible. # TODO(jmadill): Run on Linux bots when possible.
'passthrough_command_buffer_perftests': { 'passthrough_command_buffer_perftests': {
...@@ -1272,6 +1286,19 @@ ...@@ -1272,6 +1286,19 @@
}, },
}, },
'gpu_angle_white_box_tests': {
# TODO(ynovikov): the old generator script said the white box
# tests are supposed to run everywhere angle_end2end_tests do, but
# they actually ran only on Windows and Linux.
'angle_white_box_tests': {
'desktop_args': [
# ANGLE test retries deliberately disabled to prevent flakiness.
# http://crbug.com/669196
'--test-launcher-retry-limit=0'
],
},
},
'gpu_common_and_optional_telemetry_tests': { 'gpu_common_and_optional_telemetry_tests': {
'info_collection': { 'info_collection': {
'args': [ 'args': [
...@@ -1337,33 +1364,6 @@ ...@@ -1337,33 +1364,6 @@
}, },
}, },
'gpu_fyi_and_optional_and_win_angle_amd_gtests': {
'angle_end2end_tests': {
'desktop_args': [
'--use-gpu-in-tests',
# ANGLE test retries deliberately disabled to prevent flakiness.
# http://crbug.com/669196
'--test-launcher-retry-limit=0'
],
'swarming': {
'shards': 4,
},
},
},
'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests': {
# TODO(ynovikov): the old generator script said the white box
# tests are supposed to run everywhere angle_end2end_tests do, but
# they actually ran only on Windows and Linux.
'angle_white_box_tests': {
'desktop_args': [
# ANGLE test retries deliberately disabled to prevent flakiness.
# http://crbug.com/669196
'--test-launcher-retry-limit=0'
],
},
},
'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': {
'webgl_conformance_d3d11_validating': { 'webgl_conformance_d3d11_validating': {
'telemetry_test_name': 'webgl_conformance', 'telemetry_test_name': 'webgl_conformance',
...@@ -2678,17 +2678,58 @@ ...@@ -2678,17 +2678,58 @@
'gpu_angle_deqp_egl_gl_tests', 'gpu_angle_deqp_egl_gl_tests',
'gpu_angle_deqp_egl_vulkan_tests', 'gpu_angle_deqp_egl_vulkan_tests',
'gpu_angle_deqp_gles2_d3d11_tests', 'gpu_angle_deqp_gles2_d3d11_tests',
# TODO(kbr): why is gpu_angle_deqp_gles2_gl_tests not here? 'gpu_angle_deqp_gles2_gl_tests',
'gpu_angle_deqp_gles2_vulkan_tests', 'gpu_angle_deqp_gles2_vulkan_tests',
'gpu_angle_deqp_gles31_d3d11_tests', 'gpu_angle_deqp_gles31_d3d11_tests',
'gpu_angle_deqp_gles31_gl_tests', 'gpu_angle_deqp_gles31_gl_tests',
'gpu_angle_deqp_gles3_d3d11_tests', 'gpu_angle_deqp_gles3_d3d11_tests',
# TODO(kbr): why is gpu_angle_deqp_gles3_gl_tests not here? 'gpu_angle_deqp_gles3_gl_tests',
], ],
'gpu_angle_gtests': [ 'gpu_angle_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests',
],
'gpu_angle_win_intel_gtests': [
'gpu_angle_deqp_gles2_d3d11_tests',
'gpu_angle_end2end_tests',
'gpu_angle_unittests',
'gpu_angle_white_box_tests',
'gpu_fyi_and_optional_win_specific_gtests',
],
'gpu_angle_win_intel_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_only_win_intel_and_nvidia_release_specific_telemetry_tests',
'gpu_fyi_only_win_linux_intel_nvidia_specific_telemetry_tests',
'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
],
'gpu_angle_win_nvidia_gtests': [
'gpu_angle_deqp_egl_d3d11_tests',
'gpu_angle_deqp_egl_gl_tests',
'gpu_angle_deqp_egl_vulkan_tests',
'gpu_angle_deqp_gles2_d3d11_tests',
'gpu_angle_deqp_gles2_gl_tests',
'gpu_angle_deqp_gles2_vulkan_tests',
'gpu_angle_deqp_gles31_d3d11_tests',
'gpu_angle_deqp_gles31_gl_tests',
'gpu_angle_deqp_gles3_d3d11_tests',
'gpu_angle_deqp_gles3_gl_tests',
'gpu_angle_end2end_tests',
'gpu_angle_unittests', 'gpu_angle_unittests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests', 'gpu_angle_white_box_tests',
'gpu_fyi_and_optional_win_specific_gtests',
],
'gpu_angle_win_nvidia_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_only_win_intel_and_nvidia_release_specific_telemetry_tests',
'gpu_fyi_only_win_linux_intel_nvidia_specific_telemetry_tests',
'gpu_fyi_optional_and_v8_desktop_release_specific_telemetry_tests',
], ],
'gpu_common_telemetry_tests': [ 'gpu_common_telemetry_tests': [
...@@ -2713,17 +2754,17 @@ ...@@ -2713,17 +2754,17 @@
], ],
'gpu_fyi_android_and_mac_gtests': [ 'gpu_fyi_android_and_mac_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests', 'gpu_angle_unittests',
'gpu_common_gtests', 'gpu_common_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests',
'gpu_fyi_and_optional_non_linux_gtests', 'gpu_fyi_and_optional_non_linux_gtests',
], ],
'gpu_fyi_linux_debug_gtests': [ 'gpu_fyi_linux_debug_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests', 'gpu_angle_unittests',
'gpu_angle_white_box_tests',
'gpu_common_gtests', 'gpu_common_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
], ],
...@@ -2736,41 +2777,41 @@ ...@@ -2736,41 +2777,41 @@
], ],
'gpu_fyi_linux_optional_gtests': [ 'gpu_fyi_linux_optional_gtests': [
'gpu_fyi_and_optional_and_win_angle_amd_gtests', 'gpu_angle_end2end_tests',
'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests', 'gpu_angle_white_box_tests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
], ],
'gpu_fyi_linux_release_gtests': [ 'gpu_fyi_linux_release_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests', 'gpu_angle_unittests',
'gpu_angle_white_box_tests',
'gpu_common_gtests', 'gpu_common_gtests',
'gpu_desktop_specific_gtests', 'gpu_desktop_specific_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
], ],
'gpu_fyi_mac_debug_gtests': [ 'gpu_fyi_mac_debug_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests', 'gpu_angle_unittests',
'gpu_common_gtests', 'gpu_common_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests',
'gpu_fyi_and_optional_non_linux_gtests', 'gpu_fyi_and_optional_non_linux_gtests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
'gpu_fyi_mac_specific_gtests', 'gpu_fyi_mac_specific_gtests',
], ],
'gpu_fyi_mac_optional_gtests': [ 'gpu_fyi_mac_optional_gtests': [
'gpu_fyi_and_optional_and_win_angle_amd_gtests', 'gpu_angle_end2end_tests',
'gpu_fyi_and_optional_non_linux_gtests', 'gpu_fyi_and_optional_non_linux_gtests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
'gpu_fyi_mac_specific_gtests', 'gpu_fyi_mac_specific_gtests',
], ],
'gpu_fyi_mac_release_gtests': [ 'gpu_fyi_mac_release_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests', 'gpu_angle_unittests',
'gpu_common_gtests', 'gpu_common_gtests',
'gpu_desktop_specific_gtests', 'gpu_desktop_specific_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests',
'gpu_fyi_and_optional_non_linux_gtests', 'gpu_fyi_and_optional_non_linux_gtests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
'gpu_fyi_mac_specific_gtests', 'gpu_fyi_mac_specific_gtests',
...@@ -2794,11 +2835,11 @@ ...@@ -2794,11 +2835,11 @@
], ],
'gpu_fyi_win7_gtests': [ 'gpu_fyi_win7_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests', 'gpu_angle_unittests',
'gpu_angle_white_box_tests',
'gpu_common_gtests', 'gpu_common_gtests',
'gpu_desktop_specific_gtests', 'gpu_desktop_specific_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
'gpu_fyi_and_optional_non_linux_gtests', 'gpu_fyi_and_optional_non_linux_gtests',
'gpu_fyi_and_optional_win_specific_gtests', 'gpu_fyi_and_optional_win_specific_gtests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
...@@ -2845,12 +2886,12 @@ ...@@ -2845,12 +2886,12 @@
], ],
'gpu_fyi_win_gtests': [ 'gpu_fyi_win_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests', 'gpu_angle_unittests',
'gpu_angle_white_box_tests',
'gpu_common_gtests', 'gpu_common_gtests',
'gpu_default_and_optional_win_specific_gtests', 'gpu_default_and_optional_win_specific_gtests',
'gpu_desktop_specific_gtests', 'gpu_desktop_specific_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
'gpu_fyi_and_optional_non_linux_gtests', 'gpu_fyi_and_optional_non_linux_gtests',
'gpu_fyi_and_optional_win_specific_gtests', 'gpu_fyi_and_optional_win_specific_gtests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
...@@ -2858,9 +2899,9 @@ ...@@ -2858,9 +2899,9 @@
], ],
'gpu_fyi_win_optional_gtests': [ 'gpu_fyi_win_optional_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_white_box_tests',
'gpu_default_and_optional_win_specific_gtests', 'gpu_default_and_optional_win_specific_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_gtests',
'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests',
'gpu_fyi_and_optional_non_linux_gtests', 'gpu_fyi_and_optional_non_linux_gtests',
'gpu_fyi_and_optional_win_specific_gtests', 'gpu_fyi_and_optional_win_specific_gtests',
'gpu_fyi_desktop_specific_gtests', 'gpu_fyi_desktop_specific_gtests',
...@@ -2892,8 +2933,8 @@ ...@@ -2892,8 +2933,8 @@
], ],
'gpu_win_angle_amd_gtests': [ 'gpu_win_angle_amd_gtests': [
'gpu_fyi_and_optional_and_win_angle_amd_gtests', 'gpu_angle_end2end_tests',
'gpu_fyi_and_optional_and_win_angle_amd_win_and_linux_specific_gtests', 'gpu_angle_white_box_tests',
], ],
'gpu_win_angle_amd_telemetry_tests': [ 'gpu_win_angle_amd_telemetry_tests': [
......
...@@ -1856,6 +1856,31 @@ ...@@ -1856,6 +1856,31 @@
{ {
'name': 'chromium.gpu.fyi', 'name': 'chromium.gpu.fyi',
'machines': { 'machines': {
# BEGIN Fake builder used as mirror targets for ANGLE's GPU tryservers
'ANGLE GPU Win10 Release (Intel HD 630)': {
'os_type': 'win',
'browser_config': 'release',
'mixins': [
'win10_intel_hd_630_stable',
],
'test_suites': {
'gtest_tests': 'gpu_angle_win_intel_gtests',
'gpu_telemetry_tests': 'gpu_angle_win_intel_telemetry_tests',
},
},
'ANGLE GPU Win10 Release (NVIDIA)': {
'os_type': 'win',
'browser_config': 'release',
'mixins': [
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_angle_win_nvidia_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_win_isolated_scripts',
'gpu_telemetry_tests': 'gpu_angle_win_nvidia_telemetry_tests',
},
},
# END Fake builder used as mirror targets for ANGLE's GPU tryservers
'Android FYI 32 Vk Release (Nexus 5X)': { 'Android FYI 32 Vk Release (Nexus 5X)': {
'os_type': 'android', 'os_type': 'android',
'skip_merge_script': True, 'skip_merge_script': True,
......
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