Skip to content

GitLab

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

Run angle_end2end_tests standalone on the bots. 

Example run time improvements, sum of all shards:

Intel GPU on Windows: 10m 45s -> 3m 46s
NVIDIA GPU on Windows: 13m 5s -> 4m 7s
ATI GPU on Windows: 17m 23s -> 2m 33s
ATI GPU on Mac Retina: 3m 20s -> 1m 0s
Intel GPU on Mac: 3m 29s -> 1m 30s
NVIDIA GPU on Mac Retina: 11m 41s -> 6m 7s
Intel GPU on Linux: 5m 55s -> 1m 5s
NVIDIA GPU on Linux: 26m 40s -> 6m 3s

Bug: angleproject:5124
Change-Id: Iccbc0646b215d43f4f59c6af98fc3e1a80cb245d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2412785Reviewed-by: default avatarKenneth Russell <kbr@chromium.org>
Commit-Queue: Jamie Madill <jmadill@chromium.org>
Cr-Commit-Position: refs/heads/master@{#816566}
parent 9a8e5a0c
Hide whitespace changes
Inline Side-by-side
Showing with 1450 additions and 1415 deletions
testing/buildbot/chromium.gpu.fyi.json
View file @ b0864983
This source diff could not be displayed because it is too large. You can view the blob instead.
testing/buildbot/chromium.swangle.json
View file @ b0864983
......@@ -274,14 +274,15 @@
},
{
"args": [
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"--xvfb"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -295,11 +296,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -506,14 +507,15 @@
},
{
"args": [
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"--xvfb"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -527,11 +529,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -738,14 +740,15 @@
},
{
"args": [
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"--xvfb"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -759,11 +762,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -970,14 +973,15 @@
},
{
"args": [
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"--xvfb"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -991,11 +995,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -1202,14 +1206,15 @@
},
{
"args": [
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"--xvfb"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -1223,11 +1228,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -1434,14 +1439,15 @@
},
{
"args": [
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"--xvfb"
],
"isolate_profile_data": true,
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -1455,11 +1461,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -1795,13 +1801,13 @@
},
{
"args": [
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -1815,11 +1821,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -2019,13 +2025,13 @@
},
{
"args": [
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -2039,11 +2045,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -2243,13 +2249,13 @@
},
{
"args": [
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -2263,11 +2269,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -2467,13 +2473,13 @@
},
{
"args": [
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -2487,11 +2493,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -2691,13 +2697,13 @@
},
{
"args": [
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -2711,11 +2717,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
},
......@@ -2915,13 +2921,13 @@
},
{
"args": [
"--gtest_filter=*Vulkan_SwiftShader*",
"--test-launcher-batch-limit=512",
"--test-launcher-retry-limit=0"
"standalone_angle_end2end_tests",
"--bot-mode",
"--gtest_filter=*Vulkan_SwiftShader*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
"script": "//testing/merge_scripts/standard_isolated_script_merge.py"
},
"swarming": {
"can_use_on_swarming_builders": true,
......@@ -2935,11 +2941,11 @@
],
"hard_timeout": 900,
"io_timeout": 900,
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
"shards": 2
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:angle_end2end_tests/"
"test": "standalone_angle_end2end_tests",
"test_id_prefix": "ninja://third_party/angle/src/tests:standalone_angle_end2end_tests/",
"use_isolated_scripts_api": true
}
]
}
......
testing/buildbot/gn_isolate_map.pyl
View file @ b0864983
......@@ -1541,10 +1541,15 @@
"label": "//sql:sql_unittests",
"type": "console_test_launcher",
},
"standalone_angle_end2end_tests": {
"label": "//third_party/angle/src/tests:standalone_angle_end2end_tests",
"script": "//third_party/angle/scripts/run_gtest_angle_test.py",
"type": "script",
},
"standalone_angle_unittests": {
"label": "//third_party/angle/src/tests:standalone_angle_unittests",
"type": "script",
"script": "//third_party/angle/scripts/run_gtest_angle_test.py",
"type": "script",
},
"storage_unittests": {
"label": "//storage:storage_unittests",
......
testing/buildbot/test_suites.pyl
View file @ b0864983
......@@ -1951,25 +1951,29 @@
},
'gpu_angle_end2end_gtests': {
'angle_end2end_tests': {
'standalone_angle_end2end_tests': {
'android_args': [
'--shard-timeout=180'
],
'desktop_args': [
'--use-gpu-in-tests',
'--shard-timeout=180',
'-v',
],
'android_swarming': {
'shards': 4,
},
'args': [
# ANGLE test retries deliberately disabled to prevent flakiness.
# http://crbug.com/669196
'--test-launcher-retry-limit=0',
'--test-launcher-batch-limit=256',
'standalone_angle_end2end_tests',
'--gtest_filter=-*Vulkan_SwiftShader*',
],
'linux_args': ['--no-xvfb'],
'should_retry_with_patch': False,
'desktop_args': [
'--bot-mode',
],
# Linux has issues with creating too many windows at once.
'linux_args': [
'--max-processes=4',
],
'swarming': {
'shards': 4,
'shards': 2,
},
'use_isolated_scripts_api': True,
},
},
......@@ -4097,15 +4101,16 @@
'--test-launcher-retry-limit=0',
],
},
'angle_end2end_tests': {
'standalone_angle_end2end_tests': {
'args': [
'standalone_angle_end2end_tests',
'--bot-mode',
'--gtest_filter=*Vulkan_SwiftShader*',
'--test-launcher-batch-limit=512',
'--test-launcher-retry-limit=0',
],
'swarming': {
'shards': 2,
},
'linux_args': [
'--xvfb',
],
'use_isolated_scripts_api': 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