Always enable all SHELL tests on ChromeOS
As SHELL library is being used by AutoEnrollmentClientImpl*, its
tests should always be ran when the platform is ChromeOS.
BUG=chromium:1151230
Change-Id: I5adfaaa35ea0367b24cc339ba0981cc85b0b61eb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2550808
Commit-Queue: Amr Aboelkher <[email protected]>
Reviewed-by: Dirk Pranke <[email protected]>
Reviewed-by: Ben Pastene <[email protected]>
Reviewed-by: Brian Sheedy <[email protected]>
Cr-Commit-Position: refs/heads/master@{#832448}
diff --git a/BUILD.gn b/BUILD.gn
index f93a89e0..9b56f2e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -442,6 +442,7 @@
"//chromeos/components/proximity_auth:proximity_auth_unittests",
"//components/exo/wayland:wayland_client_compatibility_tests",
"//components/session_manager/core",
+ "//third_party/shell-encryption:shell_encryption_unittests",
"//ui/chromeos:ui_chromeos_unittests",
]
}
diff --git a/testing/buildbot/chrome.json b/testing/buildbot/chrome.json
index 45814cba..8998ef6 100644
--- a/testing/buildbot/chrome.json
+++ b/testing/buildbot/chrome.json
@@ -8016,6 +8016,25 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04",
+ "pool": "chrome.tests",
+ "ssd": "0"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
@@ -9817,6 +9836,25 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04",
+ "pool": "chrome.tests",
+ "ssd": "0"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
@@ -11633,6 +11671,25 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04",
+ "pool": "chrome.tests",
+ "ssd": "0"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
@@ -13425,6 +13482,25 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04",
+ "pool": "chrome.tests",
+ "ssd": "0"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
@@ -15217,6 +15293,25 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04",
+ "pool": "chrome.tests",
+ "ssd": "0"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index d1fc73a..b8de02d 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -2590,6 +2590,23 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
@@ -4257,6 +4274,24 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
diff --git a/testing/buildbot/chromium.fyi.json b/testing/buildbot/chromium.fyi.json
index 465e12d..1065bad4 100644
--- a/testing/buildbot/chromium.fyi.json
+++ b/testing/buildbot/chromium.fyi.json
@@ -47471,6 +47471,24 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "isolate_profile_data": true,
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
diff --git a/testing/buildbot/chromium.memory.json b/testing/buildbot/chromium.memory.json
index 32d6d91..36b110a7 100644
--- a/testing/buildbot/chromium.memory.json
+++ b/testing/buildbot/chromium.memory.json
@@ -8331,6 +8331,26 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "args": [
+ "--test-launcher-print-test-stdio=always"
+ ],
+ "merge": {
+ "args": [],
+ "script": "//testing/merge_scripts/standard_gtest_merge.py"
+ },
+ "swarming": {
+ "can_use_on_swarming_builders": true,
+ "dimension_sets": [
+ {
+ "os": "Ubuntu-16.04"
+ }
+ ],
+ "service_account": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
@@ -10268,6 +10288,27 @@
],
"service_account": "[email protected]"
},
+ "test": "shell_encryption_unittests",
+ "test_id_prefix": "ninja://third_party/shell-encryption:shell_encryption_unittests/"
+ },
+ {
+ "args": [
+ "--test-launcher-print-test-stdio=always"
+ ],
+ "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": "[email protected]"
+ },
"test": "skia_unittests",
"test_id_prefix": "ninja://skia:skia_unittests/"
},
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 09565e1a..b637388 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -1554,6 +1554,10 @@
"label": "//chrome/installer/setup:setup_unittests",
"type": "console_test_launcher",
},
+ "shell_encryption_unittests": {
+ "label": "//third_party/shell-encryption:shell_encryption_unittests",
+ "type": "console_test_launcher",
+ },
"shell_dialogs_unittests": {
"label": "//ui/shell_dialogs:shell_dialogs_unittests",
"type": "console_test_launcher",
diff --git a/testing/buildbot/test_suites.pyl b/testing/buildbot/test_suites.pyl
index 3af80154..c3ffdf4d 100644
--- a/testing/buildbot/test_suites.pyl
+++ b/testing/buildbot/test_suites.pyl
@@ -3783,6 +3783,7 @@
},
'ozone_unittests': {},
'ozone_x11_unittests': {},
+ 'shell_encryption_unittests': {},
'ui_chromeos_unittests': {},
'usage_time_limit_unittests': {
'experiment_percentage': 100,
