From ef743dd6fa992f43b9417d07c281b1f39b7d5ad2 Mon Sep 17 00:00:00 2001 From: Liviu Rau Date: Wed, 3 Jun 2020 13:47:28 +0000 Subject: [PATCH] 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 Reviewed-by: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#774602} --- .../client.devtools-frontend.integration.json | 21 +++++++++++++++++ testing/buildbot/devtools-frontend.ci.json | 21 +++++++++++++++++ testing/buildbot/devtools-frontend.try.json | 23 +++++++++++++++++++ testing/buildbot/test_suites.pyl | 17 ++++++++++++++ .../buildbot/tryserver.devtools-frontend.json | 23 +++++++++++++++++++ testing/buildbot/waterfalls.pyl | 3 ++- 6 files changed, 107 insertions(+), 1 deletion(-) diff --git a/testing/buildbot/client.devtools-frontend.integration.json b/testing/buildbot/client.devtools-frontend.integration.json index 21bc481b49ec16..1fc5425e9f972f 100644 --- a/testing/buildbot/client.devtools-frontend.integration.json +++ b/testing/buildbot/client.devtools-frontend.integration.json @@ -23,6 +23,27 @@ }, "test": "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": [ diff --git a/testing/buildbot/devtools-frontend.ci.json b/testing/buildbot/devtools-frontend.ci.json index 207e7060a91a7e..29324024c2f048 100644 --- a/testing/buildbot/devtools-frontend.ci.json +++ b/testing/buildbot/devtools-frontend.ci.json @@ -23,6 +23,27 @@ }, "test": "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": [ diff --git a/testing/buildbot/devtools-frontend.try.json b/testing/buildbot/devtools-frontend.try.json index 0f6efddd563801..d3d4b0ef444d9b 100644 --- a/testing/buildbot/devtools-frontend.try.json +++ b/testing/buildbot/devtools-frontend.try.json @@ -2,6 +2,29 @@ "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {}, "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": [ { "args": [ diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl index d1f21cdb7e02d7..9306fc8ae9e9da 100644 --- a/testing/buildbot/test_suites.pyl +++ b/testing/buildbot/test_suites.pyl @@ -1167,6 +1167,18 @@ }, }, + 'devtools_browser_tests' : { + 'devtools_browser_tests': { + 'args': [ + '--gtest_filter=*DevTools*', + ], + 'swarming': { + 'shards': 1, + }, + 'test': 'browser_tests', + } + }, + 'devtools_webkit_isolated_scripts': { 'blink_web_tests': { # layout test failures are retried 3 times when '--test-list' is not @@ -4372,6 +4384,11 @@ 'cronet_sizes', ], + 'devtools_gtests': [ + 'devtools_browser_tests', + 'layout_ng_gtests', + ], + # BEGIN composition test suites used by the GPU bots 'gpu_angle_and_desktop_representative_perf_fyi_isolated_scripts': [ diff --git a/testing/buildbot/tryserver.devtools-frontend.json b/testing/buildbot/tryserver.devtools-frontend.json index 0f6efddd563801..d3d4b0ef444d9b 100644 --- a/testing/buildbot/tryserver.devtools-frontend.json +++ b/testing/buildbot/tryserver.devtools-frontend.json @@ -2,6 +2,29 @@ "AAAAA1 AUTOGENERATED FILE DO NOT EDIT": {}, "AAAAA2 See generate_buildbot_json.py to make changes": {}, "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": [ { "args": [ diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl index adc4559f97a314..a7ca430b6a814f 100644 --- a/testing/buildbot/waterfalls.pyl +++ b/testing/buildbot/waterfalls.pyl @@ -4807,7 +4807,7 @@ 'linux-xenial', ], 'test_suites': { - 'gtest_tests': 'layout_ng_gtests', + 'gtest_tests': 'devtools_gtests', 'isolated_scripts': 'devtools_webkit_isolated_scripts', }, }, @@ -5106,6 +5106,7 @@ 'linux-xenial', ], 'test_suites': { + 'gtest_tests': 'devtools_browser_tests', 'isolated_scripts': 'devtools_webkit_isolated_scripts', }, },