diff --git a/build/toolchain/linux/BUILD.gn b/build/toolchain/linux/BUILD.gn
index 39f963f4c2755..ee494546ffcb6 100644
--- a/build/toolchain/linux/BUILD.gn
+++ b/build/toolchain/linux/BUILD.gn
@@ -184,6 +184,7 @@ clang_toolchain("ash_clang_x64") {
chromeos_is_browser_only = false
ozone_platform = "x11"
ozone_platform_wayland = false
+ use_clang_coverage = false
}
}
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 141fe2c8935bf..63cf8007e6384 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -26211,6 +26211,68 @@ buckets {
}
}
}
+ builders {
+ name: "linux-lacros-code-coverage"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:32"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-16.04"
+ dimensions: "pool:luci.chromium.ci"
+ dimensions: "ssd:1"
+ exe {
+ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+ cipd_version: "refs/heads/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$build/code_coverage\":{\"coverage_test_types\":[\"overall\",\"unit\"],\"use_clang_coverage\":true},\"$build/goma\":{\"enable_ats\":true,\"rpc_extra_params\":\"?prod\",\"server_host\":\"goma.chromium.org\",\"use_luci_auth\":true},\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"$recipe_engine/isolated\":{\"server\":\"https://isolateserver.appspot.com\"},\"builder_group\":\"chromium.fyi\",\"recipe\":\"chromium\"}"
+ execution_timeout_secs: 72000
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ value: 100
+ }
+ experiments {
+ key: "chromium.resultdb.result_sink.gtests_local"
+ value: 100
+ }
+ experiments {
+ key: "chromium.resultdb.result_sink.junit_tests"
+ value: 100
+ }
+ experiments {
+ key: "luci.buildbucket.use_bbagent"
+ value: 100
+ }
+ experiments {
+ key: "luci.use_realms"
+ value: 100
+ }
+ resultdb {
+ enable: true
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "ci_test_results"
+ test_results {}
+ }
+ bq_exports {
+ project: "luci-resultdb"
+ dataset: "chromium"
+ table: "gpu_ci_test_results"
+ test_results {
+ predicate {
+ test_id_regexp: "ninja://(chrome/test:|content/test:fuchsia_)telemetry_gpu_integration_test/.+"
+ }
+ }
+ }
+ history_options {
+ use_invocation_timestamp: true
+ }
+ }
+ }
builders {
name: "linux-lacros-tester-fyi-rel"
swarming_host: "chromium-swarm.appspot.com"
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
index 13ad0e6a163e3..62fa1c5ebd641 100644
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -5646,6 +5646,11 @@ consoles {
category: "code_coverage"
short_name: "ios"
}
+ builders {
+ name: "buildbucket/luci.chromium.ci/linux-lacros-code-coverage"
+ category: "code_coverage"
+ short_name: "lac"
+ }
builders {
name: "buildbucket/luci.chromium.ci/win10-code-coverage"
category: "code_coverage"
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index 21e9b1eb0b55e..a3878273450d8 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -5620,6 +5620,16 @@ job {
builder: "linux-lacros-builder-rel"
}
}
+job {
+ id: "linux-lacros-code-coverage"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "linux-lacros-code-coverage"
+ }
+}
job {
id: "linux-lacros-tester-fyi-rel"
realm: "ci"
@@ -7011,6 +7021,7 @@ trigger {
triggers: "linux-gcc-rel"
triggers: "linux-lacros-builder-fyi-rel"
triggers: "linux-lacros-builder-rel"
+ triggers: "linux-lacros-code-coverage"
triggers: "linux-official"
triggers: "linux-ozone-rel"
triggers: "linux-perfetto-rel"
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index c0de2c2206a29..26fb30028e823 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -3784,6 +3784,16 @@ ci.fyi_coverage_builder(
triggered_by = [],
)
+ci.fyi_coverage_builder(
+ name = "linux-lacros-code-coverage",
+ console_view_entry = consoles.console_view_entry(
+ category = "code_coverage",
+ short_name = "lac",
+ ),
+ use_clang_coverage = True,
+ coverage_test_types = ["overall", "unit"],
+)
+
ci.fyi_coverage_builder(
name = "mac-code-coverage",
builderless = True,
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 4a0f3356222be..cdef208215875 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -50004,6 +50004,1116 @@
}
]
},
+ "linux-lacros-code-coverage": {
+ "additional_compile_targets": [
+ "chrome"
+ ],
+ "gtest_tests": [
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "absl_hardening_tests",
+ "test_id_prefix": "ninja://third_party/abseil-cpp:absl_hardening_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "accessibility_unittests",
+ "test_id_prefix": "ninja://ui/accessibility:accessibility_unittests/"
+ },
+ {
+ "args": [
+ "angle_unittests"
+ ],
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "angle_unittests",
+ "test_id_prefix": "ninja://third_party/angle/src/tests:angle_unittests/",
+ "use_isolated_scripts_api": true
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "app_shell_unittests",
+ "test_id_prefix": "ninja://extensions/shell:app_shell_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "aura_unittests",
+ "test_id_prefix": "ninja://ui/aura:aura_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "base_unittests",
+ "test_id_prefix": "ninja://base:base_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "base_util_unittests",
+ "test_id_prefix": "ninja://base/util:base_util_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "blink_common_unittests",
+ "test_id_prefix": "ninja://third_party/blink/common:blink_common_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "blink_fuzzer_unittests",
+ "test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_fuzzer_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "blink_heap_unittests",
+ "test_id_prefix": "ninja://third_party/blink/renderer/platform/heap:blink_heap_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "blink_platform_unittests",
+ "test_id_prefix": "ninja://third_party/blink/renderer/platform:blink_platform_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "webkit_unit_tests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "blink_unittests",
+ "test_id_prefix": "ninja://third_party/blink/renderer/controller:blink_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "boringssl_crypto_tests",
+ "test_id_prefix": "ninja://third_party/boringssl:boringssl_crypto_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "boringssl_ssl_tests",
+ "test_id_prefix": "ninja://third_party/boringssl:boringssl_ssl_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 10
+ },
+ "test": "browser_tests",
+ "test_id_prefix": "ninja://chrome/test:browser_tests/"
+ },
+ {
+ "args": [
+ "--gtest_filter=-*UsingRealWebcam*"
+ ],
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "capture_unittests",
+ "test_id_prefix": "ninja://media/capture:capture_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "cast_unittests",
+ "test_id_prefix": "ninja://media/cast:cast_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "cc_unittests",
+ "test_id_prefix": "ninja://cc:cc_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "chrome_app_unittests",
+ "test_id_prefix": "ninja://chrome/test:chrome_app_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "chromedriver_unittests",
+ "test_id_prefix": "ninja://chrome/test/chromedriver:chromedriver_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "chromeos_unittests",
+ "test_id_prefix": "ninja://chromeos:chromeos_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "color_unittests",
+ "test_id_prefix": "ninja://ui/color:color_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "components_browsertests",
+ "test_id_prefix": "ninja://components:components_browsertests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "components_unittests",
+ "test_id_prefix": "ninja://components:components_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "compositor_unittests",
+ "test_id_prefix": "ninja://ui/compositor:compositor_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 6
+ },
+ "test": "content_browsertests",
+ "test_id_prefix": "ninja://content/test:content_browsertests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "content_unittests",
+ "test_id_prefix": "ninja://content/test:content_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "crashpad_tests",
+ "test_id_prefix": "ninja://third_party/crashpad/crashpad:crashpad_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "crypto_unittests",
+ "test_id_prefix": "ninja://crypto:crypto_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "dbus_unittests",
+ "test_id_prefix": "ninja://dbus:dbus_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "device_unittests",
+ "test_id_prefix": "ninja://device:device_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "display_unittests",
+ "test_id_prefix": "ninja://ui/display:display_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "events_unittests",
+ "test_id_prefix": "ninja://ui/events:events_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "extensions_browsertests",
+ "test_id_prefix": "ninja://extensions:extensions_browsertests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "extensions_unittests",
+ "test_id_prefix": "ninja://extensions:extensions_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "filesystem_service_unittests",
+ "test_id_prefix": "ninja://components/services/filesystem:filesystem_service_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gcm_unit_tests",
+ "test_id_prefix": "ninja://google_apis/gcm:gcm_unit_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gfx_unittests",
+ "test_id_prefix": "ninja://ui/gfx:gfx_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gin_unittests",
+ "test_id_prefix": "ninja://gin:gin_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "google_apis_unittests",
+ "test_id_prefix": "ninja://google_apis:google_apis_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gpu_unittests",
+ "test_id_prefix": "ninja://gpu:gpu_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gwp_asan_unittests",
+ "test_id_prefix": "ninja://components/gwp_asan:gwp_asan_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
+ },
+ "test": "interactive_ui_tests",
+ "test_id_prefix": "ninja://chrome/test:interactive_ui_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "ipc_tests",
+ "test_id_prefix": "ninja://ipc:ipc_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "jingle_unittests",
+ "test_id_prefix": "ninja://jingle:jingle_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "lacros_chrome_browsertests",
+ "test_id_prefix": "ninja://chrome/test:lacros_chrome_browsertests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "lacros_chrome_unittests",
+ "test_id_prefix": "ninja://chrome/test:lacros_chrome_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "latency_unittests",
+ "test_id_prefix": "ninja://ui/latency:latency_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "libjingle_xmpp_unittests",
+ "test_id_prefix": "ninja://third_party/libjingle_xmpp:libjingle_xmpp_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "liburlpattern_unittests",
+ "test_id_prefix": "ninja://third_party/liburlpattern:liburlpattern_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "media_blink_unittests",
+ "test_id_prefix": "ninja://media/blink:media_blink_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "media_unittests",
+ "test_id_prefix": "ninja://media:media_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "message_center_unittests",
+ "test_id_prefix": "ninja://ui/message_center:message_center_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "midi_unittests",
+ "test_id_prefix": "ninja://media/midi:midi_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "mojo_core_unittests",
+ "test_id_prefix": "ninja://mojo/core:mojo_core_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "mojo_unittests",
+ "test_id_prefix": "ninja://mojo:mojo_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "nacl_helper_nonsfi_unittests",
+ "test_id_prefix": "ninja://components/nacl/loader:nacl_helper_nonsfi_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "nacl_loader_unittests",
+ "test_id_prefix": "ninja://components/nacl/loader:nacl_loader_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "native_theme_unittests",
+ "test_id_prefix": "ninja://ui/native_theme:native_theme_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "net_unittests",
+ "test_id_prefix": "ninja://net:net_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "pdf_unittests",
+ "test_id_prefix": "ninja://pdf:pdf_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "perfetto_unittests",
+ "test_id_prefix": "ninja://third_party/perfetto:perfetto_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "ppapi_unittests",
+ "test_id_prefix": "ninja://ppapi:ppapi_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "printing_unittests",
+ "test_id_prefix": "ninja://printing:printing_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "remoting_unittests",
+ "test_id_prefix": "ninja://remoting:remoting_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "sandbox_linux_unittests",
+ "test_id_prefix": "ninja://sandbox/linux:sandbox_linux_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "service_manager_unittests",
+ "test_id_prefix": "ninja://services/service_manager/tests:service_manager_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "services_unittests",
+ "test_id_prefix": "ninja://services:services_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "shell_dialogs_unittests",
+ "test_id_prefix": "ninja://ui/shell_dialogs:shell_dialogs_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "skia_unittests",
+ "test_id_prefix": "ninja://skia:skia_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "snapshot_unittests",
+ "test_id_prefix": "ninja://ui/snapshot:snapshot_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "sql_unittests",
+ "test_id_prefix": "ninja://sql:sql_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "storage_unittests",
+ "test_id_prefix": "ninja://storage:storage_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "sync_integration_tests",
+ "test_id_prefix": "ninja://chrome/test:sync_integration_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "traffic_annotation_auditor_unittests",
+ "test_id_prefix": "ninja://tools/traffic_annotation/auditor:traffic_annotation_auditor_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "ui_base_unittests",
+ "test_id_prefix": "ninja://ui/base:ui_base_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "ui_touch_selection_unittests",
+ "test_id_prefix": "ninja://ui/touch_selection:ui_touch_selection_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "unit_tests",
+ "test_id_prefix": "ninja://chrome/test:unit_tests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "url_unittests",
+ "test_id_prefix": "ninja://url:url_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "views_unittests",
+ "test_id_prefix": "ninja://ui/views:views_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "viz_unittests",
+ "test_id_prefix": "ninja://components/viz:viz_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "wm_unittests",
+ "test_id_prefix": "ninja://ui/wm:wm_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "wtf_unittests",
+ "test_id_prefix": "ninja://third_party/blink/renderer/platform/wtf:wtf_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "zlib_unittests",
+ "test_id_prefix": "ninja://third_party/zlib:zlib_unittests/"
+ }
+ ]
+ },
"linux-lacros-tester-fyi-rel": {
"additional_compile_targets": [
"chrome",
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 0c9d21f4b2faa..ca94c04a5110e 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -3244,6 +3244,17 @@
'gtest_tests': 'fieldtrial_browser_tests',
},
},
+ 'linux-lacros-code-coverage': {
+ 'additional_compile_targets': [
+ 'chrome',
+ ],
+ 'mixins': [
+ 'isolate_profile_data',
+ ],
+ 'test_suites': {
+ 'gtest_tests': 'linux_lacros_gtests',
+ },
+ },
'linux-lacros-tester-fyi-rel': {
'additional_compile_targets': [
'chrome',
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index cd6a02c5b0ac2..f0c4925901d8f 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -354,6 +354,7 @@
'linux-example-builder': 'release_bot',
'linux-fieldtrial-rel': 'release_bot_minimal_symbols',
'linux-backuprefptr-x64-fyi-rel': 'release_trybot_backuprefptr_x64',
+ 'linux-lacros-code-coverage': 'lacros_on_linux_clang_code_coverage',
'linux-perfetto-rel': 'perfetto_release_bot',
'linux-upload-perfetto': 'release_bot',
'linux-wpt-fyi-rel': 'release_bot_minimal_symbols',
@@ -2314,6 +2315,10 @@
'ios', 'ios_simulator', 'ios_cpu_x64', 'release_bot', 'asan', 'xctest', 'ios_disable_xcode_project_generation',
],
+ 'lacros_on_linux_clang_code_coverage': [
+ 'lacros_on_linux', 'release_bot', 'also_build_ash_chrome', 'clang', 'use_clang_coverage', 'no_symbols',
+ ],
+
'lacros_on_linux_release_bot': [
'lacros_on_linux', 'release_bot', 'also_build_ash_chrome',
],
diff --git a/tools/mb/mb_config_expectations/chromium.fyi.json b/tools/mb/mb_config_expectations/chromium.fyi.json
index 4442eb0cfc797..6961c2f428461 100644
--- a/tools/mb/mb_config_expectations/chromium.fyi.json
+++ b/tools/mb/mb_config_expectations/chromium.fyi.json
@@ -776,6 +776,23 @@
"use_ozone": true
}
},
+ "linux-lacros-code-coverage": {
+ "gn_args": {
+ "also_build_ash_chrome": true,
+ "chromeos_is_browser_only": true,
+ "is_clang": true,
+ "is_component_build": false,
+ "is_debug": false,
+ "ozone_platform": "wayland",
+ "ozone_platform_wayland": true,
+ "symbol_level": 0,
+ "target_os": "chromeos",
+ "use_clang_coverage": true,
+ "use_goma": true,
+ "use_gtk": false,
+ "use_ozone": true
+ }
+ },
"linux-lacros-tester-fyi-rel": {
"gn_args": {
"also_build_ash_chrome": true,