Skip to content

GitLab

T
tangled
Commit d260cfb5 authored by Jamie Madill's avatar Jamie Madill Committed by Commit Bot
Browse files
Options

Remove dEQP tests from ANGLE fake builders. 

The dEQP test suites need to be run on specific dEQP buidlers
and testers. Trying to build dEQP on these configs was breaking
the ANGLE CQ when the testers were enabled. After this change
the configs can be re-added to the tools/build repo.

Bug: 822310
Change-Id: I7dae7799948819004640f14379839c425f8a8280
Reviewed-on: https://chromium-review.googlesource.com/c/1357002Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#612811}
parent d737bcb5
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 230 deletions
testing/buildbot/chromium.gpu.fyi.json
View file @ d260cfb5
......@@ -3,25 +3,6 @@
"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",
......@@ -362,196 +343,6 @@
},
"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",
......
testing/buildbot/test_suites.pyl
View file @ d260cfb5
......@@ -2725,8 +2725,7 @@
'gpu_angle_unittests',
],
'gpu_angle_win_intel_gtests': [
'gpu_angle_deqp_gles2_d3d11_tests',
'gpu_angle_win_gtests': [
'gpu_angle_end2end_tests',
'gpu_angle_unittests',
'gpu_angle_white_box_tests',
......@@ -2741,23 +2740,6 @@
'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_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',
......
testing/buildbot/waterfalls.pyl
View file @ d260cfb5
......@@ -1861,7 +1861,7 @@
'win10_intel_hd_630_stable',
],
'test_suites': {
'gtest_tests': 'gpu_angle_win_intel_gtests',
'gtest_tests': 'gpu_angle_win_gtests',
'gpu_telemetry_tests': 'gpu_angle_win_intel_telemetry_tests',
},
},
......@@ -1872,7 +1872,7 @@
'win10_nvidia_quadro_p400_stable',
],
'test_suites': {
'gtest_tests': 'gpu_angle_win_nvidia_gtests',
'gtest_tests': 'gpu_angle_win_gtests',
'isolated_scripts': 'gpu_fyi_and_optional_win_isolated_scripts',
'gpu_telemetry_tests': 'gpu_angle_win_nvidia_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