Skip to content

GitLab

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

Fix test suite exceptions for angle_end2end_tests. 

This forces the test suite off of some one-off Android configs
and some Linux configs. Re-enables the test suite on AMD 550 RX
because it seems to be passing without issues.

Bug: angleproject:5124
Change-Id: If36a2dd72499e852ff41041a2495f1f47bd02213
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2469956
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Commit-Queue: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Kenneth Russell <kbr@chromium.org>
Auto-Submit: Jamie Madill <jmadill@chromium.org>
Reviewed-by: default avatarBrian Sheedy <bsheedy@chromium.org>
Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Reviewed-by: default avatarYuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816855}
parent 6a8863e7
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 162 deletions
testing/buildbot/chromium.gpu.fyi.json
View file @ abe1eead
......@@ -4332,36 +4332,6 @@
"test": "gpu_unittests",
"test_id_prefix": "ninja://gpu:gpu_unittests/"
},
{
"args": [
"standalone_angle_end2end_tests",
"--gtest_filter=-*Vulkan_SwiftShader*",
"--shard-timeout=180",
"-v"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "L",
"device_os_type": "userdebug",
"device_type": "hammerhead",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"standalone_angle_unittests",
......@@ -5436,36 +5406,6 @@
"test": "gpu_unittests",
"test_id_prefix": "ninja://gpu:gpu_unittests/"
},
{
"args": [
"standalone_angle_end2end_tests",
"--gtest_filter=-*Vulkan_SwiftShader*",
"--shard-timeout=180",
"-v"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "L",
"device_os_type": "userdebug",
"device_type": "shamu",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"standalone_angle_unittests",
......@@ -6534,36 +6474,6 @@
"test": "gpu_unittests",
"test_id_prefix": "ninja://gpu:gpu_unittests/"
},
{
"args": [
"standalone_angle_end2end_tests",
"--gtest_filter=-*Vulkan_SwiftShader*",
"--shard-timeout=180",
"-v"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"device_os": "M",
"device_os_type": "userdebug",
"device_type": "flounder",
"os": "Android",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 4
},
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"standalone_angle_unittests",
......@@ -8328,34 +8238,6 @@
"test": "gles2_conform_test",
"test_id_prefix": "ninja://gpu/gles2_conform_support:gles2_conform_test/"
},
{
"args": [
"standalone_angle_end2end_tests",
"--gtest_filter=-*Vulkan_SwiftShader*",
"--bot-mode",
"--max-processes=4"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "10de:1cb3-418.56",
"os": "Ubuntu-19.04",
"pool": "chromium.tests.gpu"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"standalone_angle_unittests"
......@@ -10244,35 +10126,6 @@
"test": "gles2_conform_test",
"test_id_prefix": "ninja://gpu/gles2_conform_support:gles2_conform_test/"
},
{
"args": [
"standalone_angle_end2end_tests",
"--gtest_filter=-*Vulkan_SwiftShader*",
"--bot-mode",
"--max-processes=4"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
"containment_type": "AUTO",
"dimension_sets": [
{
"gpu": "1002:6613",
"os": "Ubuntu",
"pool": "chromium.tests.gpu"
}
],
"expiration": 21600,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
},
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
},
{
"args": [
"standalone_angle_unittests"
testing/buildbot/test_suite_exceptions.pyl
View file @ abe1eead
......@@ -74,21 +74,6 @@
},
},
},
'angle_end2end_tests': {
'remove_from': [
# TODO(ynovikov) Investigate why the test breaks on older devices.
'Android FYI Release (Nexus 5)',
'Android FYI Release (Nexus 6)',
'Android FYI Release (Nexus 9)',
# Temporarily disabled due to AMDGPU-PRO issues crbug.com/786219
'Linux FYI Release (AMD R7 240)',
# Temporarily disabled due to bad NVIDIA driver upgrade crbug.com/950542
'Linux FYI Debug (NVIDIA)',
# Disabling on RX 550 as we are currently qualifying the card and not
# checking for regressions. crbug.com/1025745
'Win10 FYI x64 Release (AMD RX 550)',
],
},
'angle_perftests': {
'remove_from': [
'Android FYI Release (Nexus 5)', # crbug.com/915429
......@@ -2539,6 +2524,18 @@
}
}
},
'standalone_angle_end2end_tests': {
'remove_from': [
# TODO(ynovikov) Investigate why the test breaks on older devices.
'Android FYI Release (Nexus 5)',
'Android FYI Release (Nexus 6)',
'Android FYI Release (Nexus 9)',
# Temporarily disabled due to AMDGPU-PRO issues crbug.com/786219
'Linux FYI Release (AMD R7 240)',
# Temporarily disabled due to bad NVIDIA driver upgrade crbug.com/950542
'Linux FYI Debug (NVIDIA)',
],
},
'standalone_angle_unittests': {
'remove_from': [
# On Android, these are already run on the main waterfall.
......
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