Commit ef743dd6 authored by Liviu Rau's avatar Liviu Rau Committed by Commit Bot

Add DevTools browser_tests

Bug: chromium:1086891
Change-Id: Ieaccbe5ba6a7d7d59e547696ba936803ad009016
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2216654
Commit-Queue: Liviu Rau <liviurau@chromium.org>
Reviewed-by: default avatarMichael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#774602}
parent 5a5853a4
...@@ -23,6 +23,27 @@ ...@@ -23,6 +23,27 @@
}, },
"test": "blink_unittests", "test": "blink_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/" "test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
},
{
"args": [
"--gtest_filter=*DevTools*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "devtools_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
} }
], ],
"isolated_scripts": [ "isolated_scripts": [
......
...@@ -23,6 +23,27 @@ ...@@ -23,6 +23,27 @@
}, },
"test": "blink_unittests", "test": "blink_unittests",
"test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/" "test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
},
{
"args": [
"--gtest_filter=*DevTools*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "devtools_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
} }
], ],
"isolated_scripts": [ "isolated_scripts": [
......
...@@ -2,6 +2,29 @@ ...@@ -2,6 +2,29 @@
"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": {},
"devtools_frontend_linux_blink_light_rel": { "devtools_frontend_linux_blink_light_rel": {
"gtest_tests": [
{
"args": [
"--gtest_filter=*DevTools*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "devtools_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
}
],
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
......
...@@ -1167,6 +1167,18 @@ ...@@ -1167,6 +1167,18 @@
}, },
}, },
'devtools_browser_tests' : {
'devtools_browser_tests': {
'args': [
'--gtest_filter=*DevTools*',
],
'swarming': {
'shards': 1,
},
'test': 'browser_tests',
}
},
'devtools_webkit_isolated_scripts': { 'devtools_webkit_isolated_scripts': {
'blink_web_tests': { 'blink_web_tests': {
# layout test failures are retried 3 times when '--test-list' is not # layout test failures are retried 3 times when '--test-list' is not
...@@ -4372,6 +4384,11 @@ ...@@ -4372,6 +4384,11 @@
'cronet_sizes', 'cronet_sizes',
], ],
'devtools_gtests': [
'devtools_browser_tests',
'layout_ng_gtests',
],
# BEGIN composition test suites used by the GPU bots # BEGIN composition test suites used by the GPU bots
'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts': [ 'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts': [
......
...@@ -2,6 +2,29 @@ ...@@ -2,6 +2,29 @@
"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": {},
"devtools_frontend_linux_blink_light_rel": { "devtools_frontend_linux_blink_light_rel": {
"gtest_tests": [
{
"args": [
"--gtest_filter=*DevTools*"
],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
},
"name": "devtools_browser_tests",
"swarming": {
"can_use_on_swarming_builders": true,
"dimension_sets": [
{
"os": "Ubuntu-16.04"
}
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
"test": "browser_tests",
"test_id_prefix": "ninja://chrome/test:browser_tests/"
}
],
"isolated_scripts": [ "isolated_scripts": [
{ {
"args": [ "args": [
......
...@@ -4807,7 +4807,7 @@ ...@@ -4807,7 +4807,7 @@
'linux-xenial', 'linux-xenial',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'layout_ng_gtests', 'gtest_tests': 'devtools_gtests',
'isolated_scripts': 'devtools_webkit_isolated_scripts', 'isolated_scripts': 'devtools_webkit_isolated_scripts',
}, },
}, },
...@@ -5106,6 +5106,7 @@ ...@@ -5106,6 +5106,7 @@
'linux-xenial', 'linux-xenial',
], ],
'test_suites': { 'test_suites': {
'gtest_tests': 'devtools_browser_tests',
'isolated_scripts': 'devtools_webkit_isolated_scripts', 'isolated_scripts': 'devtools_webkit_isolated_scripts',
}, },
}, },
......
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