Add Linux&Mac FYI bots for PartitionAlloc-Everywhere
While at it, add a couple tests for Android and Windows.
Bug: 1121427
Ignore-Goma-Freeze: small increased goma usage (4 CI builders x 80 jobs).
Change-Id: Ia14a52ebe2051b023a6e291f4d2982a952fb3507
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2560355
Commit-Queue: Bartek Nowierski <bartekn@chromium.org>
Reviewed-by: Garrett Beaty <gbeaty@chromium.org>
Auto-Submit: Bartek Nowierski <bartekn@chromium.org>
Cr-Commit-Position: refs/heads/master@{#832171}
diff --git a/infra/config/generated/cr-buildbucket.cfg b/infra/config/generated/cr-buildbucket.cfg
index 8b24a5f..c739705 100644
--- a/infra/config/generated/cr-buildbucket.cfg
+++ b/infra/config/generated/cr-buildbucket.cfg
@@ -18184,6 +18184,100 @@
}
}
builders {
+ name: "linux-paeverywhere-x64-fyi-dbg"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-16.04"
+ dimensions: "pool:luci.chromium.ci"
+ dimensions: "ssd:0"
+ exe {
+ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+ cipd_version: "refs/heads/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$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: 36000
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ 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/.+"
+ }
+ }
+ }
+ }
+ }
+ builders {
+ name: "linux-paeverywhere-x64-fyi-rel"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Ubuntu-16.04"
+ dimensions: "pool:luci.chromium.ci"
+ dimensions: "ssd:0"
+ exe {
+ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+ cipd_version: "refs/heads/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$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: 36000
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ 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/.+"
+ }
+ }
+ }
+ }
+ }
+ builders {
name: "linux-perfetto-rel"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
@@ -19355,6 +19449,98 @@
}
}
builders {
+ name: "mac-paeverywhere-x64-fyi-dbg"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Mac"
+ dimensions: "pool:luci.chromium.ci"
+ exe {
+ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+ cipd_version: "refs/heads/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$build/goma\":{\"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: 36000
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ 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/.+"
+ }
+ }
+ }
+ }
+ }
+ builders {
+ name: "mac-paeverywhere-x64-fyi-rel"
+ swarming_host: "chromium-swarm.appspot.com"
+ swarming_tags: "vpython:native-python-wrapper"
+ dimensions: "builderless:1"
+ dimensions: "cores:8"
+ dimensions: "cpu:x86-64"
+ dimensions: "os:Mac"
+ dimensions: "pool:luci.chromium.ci"
+ exe {
+ cipd_package: "infra/recipe_bundles/chromium.googlesource.com/chromium/tools/build"
+ cipd_version: "refs/heads/master"
+ cmd: "recipes"
+ }
+ properties: "{\"$build/goma\":{\"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: 36000
+ build_numbers: YES
+ service_account: "chromium-ci-builder@chops-service-accounts.iam.gserviceaccount.com"
+ experiments {
+ key: "chromium.resultdb.result_sink"
+ 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/.+"
+ }
+ }
+ }
+ }
+ }
+ builders {
name: "mac-swangle-chromium-x64"
swarming_host: "chromium-swarm.appspot.com"
swarming_tags: "vpython:native-python-wrapper"
diff --git a/infra/config/generated/goma-usage.pyl b/infra/config/generated/goma-usage.pyl
index 1072600d..30c413c1 100644
--- a/infra/config/generated/goma-usage.pyl
+++ b/infra/config/generated/goma-usage.pyl
@@ -3,15 +3,15 @@
# This is consumed by presubmit checks that need to validate the config
{
- # 61150 (scheduler total) + 344990 (weighted CQ total)
+ # 61470 (scheduler total) + 344990 (weighted CQ total)
# (weighted CQ total) = 6899.8 (CQ total) * 50 (CQ weight)
- '*weighted total*': 406140,
+ '*weighted total*': 406460,
'scheduler': {
- '*total*': 61150,
+ '*total*': 61470,
'triggered': {
- '*total*': 59600,
+ '*total*': 59920,
('https://chromium.googlesource.com/chromium/src', 'regexp:refs/heads/master'): {
- '*total*': 58720,
+ '*total*': 59040,
# 4 concurrent builds x 80 jobs
'ci/ASAN Debug': 320,
# 5 concurrent builds x 80 jobs
@@ -319,6 +319,8 @@
'ci/linux-lacros-builder-rel': 80,
'ci/linux-official': 200,
'ci/linux-ozone-rel': 500,
+ 'ci/linux-paeverywhere-x64-fyi-dbg': 80,
+ 'ci/linux-paeverywhere-x64-fyi-rel': 80,
'ci/linux-perfetto-rel': 80,
'ci/linux-swangle-chromium-x64': 80,
'ci/linux-swangle-tot-angle-x64': 80,
@@ -343,6 +345,8 @@
'ci/mac-mojo-rel': 40,
# jobs count assumes an 8-core machine
'ci/mac-official': 80,
+ 'ci/mac-paeverywhere-x64-fyi-dbg': 80,
+ 'ci/mac-paeverywhere-x64-fyi-rel': 80,
# jobs count assumes an 8-core machine
'ci/mac-swangle-chromium-x64': 80,
# jobs count assumes an 8-core machine
diff --git a/infra/config/generated/luci-milo.cfg b/infra/config/generated/luci-milo.cfg
index 8f40ed0..0bdcf8c 100644
--- a/infra/config/generated/luci-milo.cfg
+++ b/infra/config/generated/luci-milo.cfg
@@ -5435,6 +5435,26 @@
short_name: "64rel"
}
builders {
+ name: "buildbucket/luci.chromium.ci/linux-paeverywhere-x64-fyi-dbg"
+ category: "paeverywhere|linux"
+ short_name: "64dbg"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/linux-paeverywhere-x64-fyi-rel"
+ category: "paeverywhere|linux"
+ short_name: "64rel"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/mac-paeverywhere-x64-fyi-dbg"
+ category: "paeverywhere|mac"
+ short_name: "64dbg"
+ }
+ builders {
+ name: "buildbucket/luci.chromium.ci/mac-paeverywhere-x64-fyi-rel"
+ category: "paeverywhere|mac"
+ short_name: "64rel"
+ }
+ builders {
name: "buildbucket/luci.chromium.ci/win-paeverywhere-x86-fyi-dbg"
category: "paeverywhere|win"
short_name: "32dbg"
diff --git a/infra/config/generated/luci-notify.cfg b/infra/config/generated/luci-notify.cfg
index 7e83bb20..ef264a0a 100644
--- a/infra/config/generated/luci-notify.cfg
+++ b/infra/config/generated/luci-notify.cfg
@@ -3082,6 +3082,32 @@
}
notifiers {
notifications {
+ on_change: true
+ email {
+ recipients: "chrome-memory-safety+bots@google.com"
+ }
+ }
+ builders {
+ bucket: "ci"
+ name: "linux-paeverywhere-x64-fyi-dbg"
+ repository: "https://chromium.googlesource.com/chromium/src"
+ }
+}
+notifiers {
+ notifications {
+ on_change: true
+ email {
+ recipients: "chrome-memory-safety+bots@google.com"
+ }
+ }
+ builders {
+ bucket: "ci"
+ name: "linux-paeverywhere-x64-fyi-rel"
+ repository: "https://chromium.googlesource.com/chromium/src"
+ }
+}
+notifiers {
+ notifications {
on_occurrence: FAILURE
failed_step_regexp: "bot_update|compile|gclient runhooks|runhooks|update"
email {
@@ -3165,6 +3191,32 @@
}
notifiers {
notifications {
+ on_change: true
+ email {
+ recipients: "chrome-memory-safety+bots@google.com"
+ }
+ }
+ builders {
+ bucket: "ci"
+ name: "mac-paeverywhere-x64-fyi-dbg"
+ repository: "https://chromium.googlesource.com/chromium/src"
+ }
+}
+notifiers {
+ notifications {
+ on_change: true
+ email {
+ recipients: "chrome-memory-safety+bots@google.com"
+ }
+ }
+ builders {
+ bucket: "ci"
+ name: "mac-paeverywhere-x64-fyi-rel"
+ repository: "https://chromium.googlesource.com/chromium/src"
+ }
+}
+notifiers {
+ notifications {
on_new_status: FAILURE
email {
recipients: "chromium-component-mapping@google.com"
diff --git a/infra/config/generated/luci-scheduler.cfg b/infra/config/generated/luci-scheduler.cfg
index db73ef4..b8a6f8e 100644
--- a/infra/config/generated/luci-scheduler.cfg
+++ b/infra/config/generated/luci-scheduler.cfg
@@ -5491,6 +5491,26 @@
}
}
job {
+ id: "linux-paeverywhere-x64-fyi-dbg"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "linux-paeverywhere-x64-fyi-dbg"
+ }
+}
+job {
+ id: "linux-paeverywhere-x64-fyi-rel"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "linux-paeverywhere-x64-fyi-rel"
+ }
+}
+job {
id: "linux-perfetto-rel"
realm: "ci"
acl_sets: "ci"
@@ -5824,6 +5844,26 @@
}
}
job {
+ id: "mac-paeverywhere-x64-fyi-dbg"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "mac-paeverywhere-x64-fyi-dbg"
+ }
+}
+job {
+ id: "mac-paeverywhere-x64-fyi-rel"
+ realm: "ci"
+ acl_sets: "ci"
+ buildbucket {
+ server: "cr-buildbucket.appspot.com"
+ bucket: "luci.chromium.ci"
+ builder: "mac-paeverywhere-x64-fyi-rel"
+ }
+}
+job {
id: "mac-swangle-chromium-x64"
realm: "ci"
acl_sets: "ci"
@@ -6652,6 +6692,8 @@
triggers: "linux-lacros-builder-rel"
triggers: "linux-official"
triggers: "linux-ozone-rel"
+ triggers: "linux-paeverywhere-x64-fyi-dbg"
+ triggers: "linux-paeverywhere-x64-fyi-rel"
triggers: "linux-perfetto-rel"
triggers: "linux-swangle-chromium-x64"
triggers: "linux-swangle-tot-angle-x64"
@@ -6674,6 +6716,8 @@
triggers: "mac-hermetic-upgrade-rel"
triggers: "mac-mojo-rel"
triggers: "mac-official"
+ triggers: "mac-paeverywhere-x64-fyi-dbg"
+ triggers: "mac-paeverywhere-x64-fyi-rel"
triggers: "mac-swangle-chromium-x64"
triggers: "mac-updater-builder-dbg"
triggers: "mac-updater-builder-rel"
diff --git a/infra/config/subprojects/chromium/ci.star b/infra/config/subprojects/chromium/ci.star
index f0d143a..8fac0a3 100644
--- a/infra/config/subprojects/chromium/ci.star
+++ b/infra/config/subprojects/chromium/ci.star
@@ -2589,6 +2589,28 @@
)
ci.fyi_builder(
+ name = "linux-paeverywhere-x64-fyi-dbg",
+ builderless = True,
+ console_view_entry = ci.console_view_entry(
+ category = "paeverywhere|linux",
+ short_name = "64dbg",
+ ),
+ notifies = ["chrome-memory-safety"],
+ os = os.LINUX_DEFAULT,
+)
+
+ci.fyi_builder(
+ name = "linux-paeverywhere-x64-fyi-rel",
+ builderless = True,
+ console_view_entry = ci.console_view_entry(
+ category = "paeverywhere|linux",
+ short_name = "64rel",
+ ),
+ notifies = ["chrome-memory-safety"],
+ os = os.LINUX_DEFAULT,
+)
+
+ci.fyi_builder(
name = "linux-perfetto-rel",
console_view_entry = ci.console_view_entry(
category = "linux",
@@ -2740,6 +2762,28 @@
triggered_by = ["mac-updater-builder-rel"],
)
+ci.fyi_builder(
+ name = "mac-paeverywhere-x64-fyi-dbg",
+ builderless = True,
+ console_view_entry = ci.console_view_entry(
+ category = "paeverywhere|mac",
+ short_name = "64dbg",
+ ),
+ notifies = ["chrome-memory-safety"],
+ os = os.MAC_ANY,
+)
+
+ci.fyi_builder(
+ name = "mac-paeverywhere-x64-fyi-rel",
+ builderless = True,
+ console_view_entry = ci.console_view_entry(
+ category = "paeverywhere|mac",
+ short_name = "64rel",
+ ),
+ notifies = ["chrome-memory-safety"],
+ os = os.MAC_ANY,
+)
+
ci.updater_builder(
name = "win-updater-builder-dbg",
console_view_entry = ci.console_view_entry(
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 4a39ced..da24421 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -10352,6 +10352,63 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "android_browsertests",
+ "test_id_prefix": "ninja://chrome/test:android_browsertests/"
+ },
+ {
+ "args": [
+ "--test-launcher-batch-limit=1"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "android_sync_integration_tests",
+ "test_id_prefix": "ninja://chrome/test:android_sync_integration_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "android_webview_unittests",
+ "test_id_prefix": "ninja://android_webview/test:android_webview_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
@@ -10394,10 +10451,176 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "breakpad_unittests",
+ "test_id_prefix": "ninja://third_party/breakpad:breakpad_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "chrome_public_smoke_test",
"test_id_prefix": "ninja://chrome/android:chrome_public_smoke_test/"
},
{
+ "args": [
+ "--git-revision=${got_revision}"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 20
+ },
+ "test": "chrome_public_test_apk",
+ "test_id_prefix": "ninja://chrome/android:chrome_public_test_apk/"
+ },
+ {
+ "args": [
+ "--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
+ "--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "chrome_public_test_vr_apk",
+ "test_id_prefix": "ninja://chrome/android:chrome_public_test_vr_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
+ },
+ "test": "content_shell_test_apk",
+ "test_id_prefix": "ninja://content/shell/android:content_shell_test_apk/"
+ },
+ {
+ "args": [
+ "--use-cmd-decoder=validating"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "gl_tests_validating",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gl_tests",
+ "test_id_prefix": "ninja://gpu:gl_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gl_unittests",
+ "test_id_prefix": "ninja://ui/gl:gl_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "mojo_test_apk",
+ "test_id_prefix": "ninja://mojo/public/java/system:mojo_test_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "ui_android_unittests",
+ "test_id_prefix": "ninja://ui/android:ui_android_unittests/"
+ },
+ {
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10436,6 +10659,43 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "vr_android_unittests",
+ "test_id_prefix": "ninja://chrome/browser/android/vr:vr_android_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 7
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "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/"
}
@@ -10458,6 +10718,63 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "android_browsertests",
+ "test_id_prefix": "ninja://chrome/test:android_browsertests/"
+ },
+ {
+ "args": [
+ "--test-launcher-batch-limit=1"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "android_sync_integration_tests",
+ "test_id_prefix": "ninja://chrome/test:android_sync_integration_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "android_webview_unittests",
+ "test_id_prefix": "ninja://android_webview/test:android_webview_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
@@ -10494,10 +10811,176 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "breakpad_unittests",
+ "test_id_prefix": "ninja://third_party/breakpad:breakpad_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "chrome_public_smoke_test",
"test_id_prefix": "ninja://chrome/android:chrome_public_smoke_test/"
},
{
+ "args": [
+ "--git-revision=${got_revision}"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 20
+ },
+ "test": "chrome_public_test_apk",
+ "test_id_prefix": "ninja://chrome/android:chrome_public_test_apk/"
+ },
+ {
+ "args": [
+ "--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
+ "--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "chrome_public_test_vr_apk",
+ "test_id_prefix": "ninja://chrome/android:chrome_public_test_vr_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
+ },
+ "test": "content_shell_test_apk",
+ "test_id_prefix": "ninja://content/shell/android:content_shell_test_apk/"
+ },
+ {
+ "args": [
+ "--use-cmd-decoder=validating"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "gl_tests_validating",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gl_tests",
+ "test_id_prefix": "ninja://gpu:gl_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gl_unittests",
+ "test_id_prefix": "ninja://ui/gl:gl_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "mojo_test_apk",
+ "test_id_prefix": "ninja://mojo/public/java/system:mojo_test_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "ui_android_unittests",
+ "test_id_prefix": "ninja://ui/android:ui_android_unittests/"
+ },
+ {
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10530,6 +11013,43 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "vr_android_unittests",
+ "test_id_prefix": "ninja://chrome/browser/android/vr:vr_android_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 7
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "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/"
}
@@ -10555,6 +11075,63 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "android_browsertests",
+ "test_id_prefix": "ninja://chrome/test:android_browsertests/"
+ },
+ {
+ "args": [
+ "--test-launcher-batch-limit=1"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "android_sync_integration_tests",
+ "test_id_prefix": "ninja://chrome/test:android_sync_integration_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "android_webview_unittests",
+ "test_id_prefix": "ninja://android_webview/test:android_webview_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
@@ -10597,10 +11174,176 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "breakpad_unittests",
+ "test_id_prefix": "ninja://third_party/breakpad:breakpad_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "chrome_public_smoke_test",
"test_id_prefix": "ninja://chrome/android:chrome_public_smoke_test/"
},
{
+ "args": [
+ "--git-revision=${got_revision}"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 20
+ },
+ "test": "chrome_public_test_apk",
+ "test_id_prefix": "ninja://chrome/android:chrome_public_test_apk/"
+ },
+ {
+ "args": [
+ "--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
+ "--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "chrome_public_test_vr_apk",
+ "test_id_prefix": "ninja://chrome/android:chrome_public_test_vr_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
+ },
+ "test": "content_shell_test_apk",
+ "test_id_prefix": "ninja://content/shell/android:content_shell_test_apk/"
+ },
+ {
+ "args": [
+ "--use-cmd-decoder=validating"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "gl_tests_validating",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gl_tests",
+ "test_id_prefix": "ninja://gpu:gl_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gl_unittests",
+ "test_id_prefix": "ninja://ui/gl:gl_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "mojo_test_apk",
+ "test_id_prefix": "ninja://mojo/public/java/system:mojo_test_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "ui_android_unittests",
+ "test_id_prefix": "ninja://ui/android:ui_android_unittests/"
+ },
+ {
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10639,6 +11382,43 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "vr_android_unittests",
+ "test_id_prefix": "ninja://chrome/browser/android/vr:vr_android_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 7
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "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/"
}
@@ -10664,6 +11444,63 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "android_browsertests",
+ "test_id_prefix": "ninja://chrome/test:android_browsertests/"
+ },
+ {
+ "args": [
+ "--test-launcher-batch-limit=1"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "android_sync_integration_tests",
+ "test_id_prefix": "ninja://chrome/test:android_sync_integration_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "android_webview_unittests",
+ "test_id_prefix": "ninja://android_webview/test:android_webview_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "base_unittests",
"test_id_prefix": "ninja://base:base_unittests/"
},
@@ -10706,10 +11543,176 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "breakpad_unittests",
+ "test_id_prefix": "ninja://third_party/breakpad:breakpad_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "chrome_public_smoke_test",
"test_id_prefix": "ninja://chrome/android:chrome_public_smoke_test/"
},
{
+ "args": [
+ "--git-revision=${got_revision}"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "precommit_args": [
+ "--gerrit-issue=${patch_issue}",
+ "--gerrit-patchset=${patch_set}",
+ "--buildbucket-id=${buildbucket_build_id}"
+ ],
+ "resultdb": {
+ "enable": true
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chrome-gold@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 20
+ },
+ "test": "chrome_public_test_apk",
+ "test_id_prefix": "ninja://chrome/android:chrome_public_test_apk/"
+ },
+ {
+ "args": [
+ "--shared-prefs-file=//chrome/android/shared_preference_files/test/vr_cardboard_skipdon_setupcomplete.json",
+ "--additional-apk=//third_party/gvr-android-sdk/test-apks/vr_services/vr_services_current.apk"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 2
+ },
+ "test": "chrome_public_test_vr_apk",
+ "test_id_prefix": "ninja://chrome/android:chrome_public_test_vr_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 3
+ },
+ "test": "content_shell_test_apk",
+ "test_id_prefix": "ninja://content/shell/android:content_shell_test_apk/"
+ },
+ {
+ "args": [
+ "--use-cmd-decoder=validating"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "gl_tests_validating",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gl_tests",
+ "test_id_prefix": "ninja://gpu:gl_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "gl_unittests",
+ "test_id_prefix": "ninja://ui/gl:gl_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "mojo_test_apk",
+ "test_id_prefix": "ninja://mojo/public/java/system:mojo_test_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "ui_android_unittests",
+ "test_id_prefix": "ninja://ui/android:ui_android_unittests/"
+ },
+ {
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
@@ -10748,6 +11751,43 @@
],
"service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
},
+ "test": "vr_android_unittests",
+ "test_id_prefix": "ninja://chrome/browser/android/vr:vr_android_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+ "shards": 7
+ },
+ "test": "webview_instrumentation_test_apk",
+ "test_id_prefix": "ninja://android_webview/test:webview_instrumentation_test_apk/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "device_type": "walleye",
+ "os": "Android"
+ }
+ ],
+ "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/"
}
@@ -53874,6 +54914,266 @@
}
]
},
+ "linux-paeverywhere-x64-fyi-dbg": {
+ "gtest_tests": [
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "base_unittests",
+ "test_id_prefix": "ninja://base:base_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "openscreen_unittests",
+ "test_id_prefix": "ninja://chrome/browser/media/router:openscreen_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "unit_tests",
+ "test_id_prefix": "ninja://chrome/test:unit_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "x11_unittests",
+ "test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
+ }
+ ]
+ },
+ "linux-paeverywhere-x64-fyi-rel": {
+ "gtest_tests": [
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "base_unittests",
+ "test_id_prefix": "ninja://base:base_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "openscreen_unittests",
+ "test_id_prefix": "ninja://chrome/browser/media/router:openscreen_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "unit_tests",
+ "test_id_prefix": "ninja://chrome/test:unit_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "x11_unittests",
+ "test_id_prefix": "ninja://ui/platform_window/x11:x11_unittests/"
+ }
+ ]
+ },
"linux-perfetto-rel": {
"additional_compile_targets": [
"chrome"
@@ -59465,6 +60765,304 @@
}
]
},
+ "mac-paeverywhere-x64-fyi-dbg": {
+ "gtest_tests": [
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "base_unittests",
+ "test_id_prefix": "ninja://base:base_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "openscreen_unittests",
+ "test_id_prefix": "ninja://chrome/browser/media/router:openscreen_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "sandbox_mac_unittests",
+ "test_id_prefix": "ninja://sandbox/mac:sandbox_mac_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "unit_tests",
+ "test_id_prefix": "ninja://chrome/test:unit_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "updater_tests",
+ "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "xr_browser_tests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "xr_browser_tests",
+ "test_id_prefix": "ninja://chrome/test:xr_browser_tests/"
+ }
+ ]
+ },
+ "mac-paeverywhere-x64-fyi-rel": {
+ "gtest_tests": [
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "base_unittests",
+ "test_id_prefix": "ninja://base:base_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "openscreen_unittests",
+ "test_id_prefix": "ninja://chrome/browser/media/router:openscreen_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "sandbox_mac_unittests",
+ "test_id_prefix": "ninja://sandbox/mac:sandbox_mac_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "unit_tests",
+ "test_id_prefix": "ninja://chrome/test:unit_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "updater_tests",
+ "test_id_prefix": "ninja://chrome/updater:updater_tests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "name": "xr_browser_tests",
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Mac-10.15"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
+ "test": "xr_browser_tests",
+ "test_id_prefix": "ninja://chrome/test:xr_browser_tests/"
+ }
+ ]
+ },
"mac-upload-perfetto": {
"additional_compile_targets": [
"trace_processor_shell"
@@ -59992,6 +61590,24 @@
],
"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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-10-18363"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "unit_tests",
"test_id_prefix": "ninja://chrome/test:unit_tests/"
},
@@ -60377,6 +61993,24 @@
],
"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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-10-18363"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "unit_tests",
"test_id_prefix": "ninja://chrome/test:unit_tests/"
},
@@ -60762,6 +62396,24 @@
],
"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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-10-18363"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "unit_tests",
"test_id_prefix": "ninja://chrome/test:unit_tests/"
},
@@ -61147,6 +62799,24 @@
],
"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/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "cpu": "x86-64",
+ "os": "Windows-10-18363"
+ }
+ ],
+ "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
+ },
"test": "unit_tests",
"test_id_prefix": "ninja://chrome/test:unit_tests/"
},
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index e43e4dcb..3af80154 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -6136,11 +6136,26 @@
],
'paeverywhere_android_gtests': [
+ 'android_specific_chromium_gtests',
'android_smoke_tests',
'paeverywhere_common_tests'
],
+ 'paeverywhere_linux_gtests': [
+ 'chromium_gtests_for_linux_and_mac_only',
+ 'chromium_gtests_for_linux_only',
+ 'chromium_gtests_for_win_and_linux_only',
+ 'paeverywhere_common_tests',
+ ],
+
+ 'paeverywhere_mac_gtests': [
+ 'chromium_gtests_for_linux_and_mac_only',
+ 'mac_specific_chromium_gtests',
+ 'paeverywhere_common_tests',
+ ],
+
'paeverywhere_win_gtests': [
+ 'chromium_gtests_for_win_and_linux_only',
'paeverywhere_common_tests',
'win_specific_chromium_gtests',
],
diff --git a/testing/buildbot/waterfalls.pyl b/testing/buildbot/waterfalls.pyl
index 76d0d08..ad2c90d 100644
--- a/testing/buildbot/waterfalls.pyl
+++ b/testing/buildbot/waterfalls.pyl
@@ -2710,6 +2710,24 @@
'gtest_tests': 'linux_lacros_gtests',
},
},
+ 'linux-paeverywhere-x64-fyi-dbg': {
+ 'test_suites': {
+ 'gtest_tests': 'paeverywhere_linux_gtests',
+ },
+ 'mixins': [
+ 'linux-xenial',
+ 'x86-64',
+ ],
+ },
+ 'linux-paeverywhere-x64-fyi-rel': {
+ 'test_suites': {
+ 'gtest_tests': 'paeverywhere_linux_gtests',
+ },
+ 'mixins': [
+ 'linux-xenial',
+ 'x86-64',
+ ],
+ },
'linux-perfetto-rel': {
'additional_compile_targets': [ 'chrome' ],
'mixins': [
@@ -2793,6 +2811,24 @@
'isolated_scripts': 'chromium_mac_rel_isolated_scripts',
},
},
+ 'mac-paeverywhere-x64-fyi-dbg': {
+ 'test_suites': {
+ 'gtest_tests': 'paeverywhere_mac_gtests',
+ },
+ 'mixins': [
+ 'mac_10.15',
+ 'x86-64',
+ ],
+ },
+ 'mac-paeverywhere-x64-fyi-rel': {
+ 'test_suites': {
+ 'gtest_tests': 'paeverywhere_mac_gtests',
+ },
+ 'mixins': [
+ 'mac_10.15',
+ 'x86-64',
+ ],
+ },
'mac-upload-perfetto': {
'additional_compile_targets': [ 'trace_processor_shell' ],
'test_suites': {
diff --git a/tools/mb/mb_config.pyl b/tools/mb/mb_config.pyl
index 176f353..d458ef6 100644
--- a/tools/mb/mb_config.pyl
+++ b/tools/mb/mb_config.pyl
@@ -311,6 +311,8 @@
'linux-chromium-tests-staging-builder': 'release_bot',
'linux-code-coverage': 'clang_code_coverage',
'linux-fieldtrial-rel': 'release_bot_minimal_symbols',
+ 'linux-paeverywhere-x64-fyi-dbg': 'debug_bot_paeverywhere_x64',
+ 'linux-paeverywhere-x64-fyi-rel': 'release_trybot_paeverywhere_x64',
'linux-perfetto-rel': 'perfetto_release_bot',
'linux-upload-perfetto': 'release_bot',
'linux-wpt-fyi-rel': 'release_bot_minimal_symbols',
@@ -319,6 +321,8 @@
'linux-wpt-payments-fyi-rel': 'release_bot_minimal_symbols',
'mac-code-coverage': 'clang_code_coverage',
'mac-hermetic-upgrade-rel': 'release_bot',
+ 'mac-paeverywhere-x64-fyi-dbg': 'debug_bot_paeverywhere_x64',
+ 'mac-paeverywhere-x64-fyi-rel': 'release_trybot_paeverywhere_x64',
'mac-upload-perfetto': 'release_bot',
'win-annotator-rel': 'release_bot',
'win-celab-builder-rel': 'release_bot_minimal_symbols',
diff --git a/tools/mb/mb_config_expectations/chromium.fyi.json b/tools/mb/mb_config_expectations/chromium.fyi.json
index 2846b8f2..05b31b01 100644
--- a/tools/mb/mb_config_expectations/chromium.fyi.json
+++ b/tools/mb/mb_config_expectations/chromium.fyi.json
@@ -633,6 +633,27 @@
"use_ozone": true
}
},
+ "linux-paeverywhere-x64-fyi-dbg": {
+ "gn_args": {
+ "is_component_build": true,
+ "is_debug": true,
+ "symbol_level": 1,
+ "target_cpu": "x64",
+ "use_allocator": "partition",
+ "use_goma": true
+ }
+ },
+ "linux-paeverywhere-x64-fyi-rel": {
+ "gn_args": {
+ "dcheck_always_on": true,
+ "is_component_build": false,
+ "is_debug": false,
+ "symbol_level": 1,
+ "target_cpu": "x64",
+ "use_allocator": "partition",
+ "use_goma": true
+ }
+ },
"linux-perfetto-rel": {
"gn_args": {
"is_component_build": false,
@@ -697,6 +718,27 @@
"use_goma": true
}
},
+ "mac-paeverywhere-x64-fyi-dbg": {
+ "gn_args": {
+ "is_component_build": true,
+ "is_debug": true,
+ "symbol_level": 1,
+ "target_cpu": "x64",
+ "use_allocator": "partition",
+ "use_goma": true
+ }
+ },
+ "mac-paeverywhere-x64-fyi-rel": {
+ "gn_args": {
+ "dcheck_always_on": true,
+ "is_component_build": false,
+ "is_debug": false,
+ "symbol_level": 1,
+ "target_cpu": "x64",
+ "use_allocator": "partition",
+ "use_goma": true
+ }
+ },
"mac-upload-perfetto": {
"gn_args": {
"is_component_build": false,