Lacros: Refactor linux lacros filter files
This CL refactor the linux lacros filter files to clarify that they're
used for linux-lacros as opposed to device.
Bug: 1195415
Change-Id: I890977a8c33341dbe07ec81a4f29da967a1fa26b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2864487
Commit-Queue: Yuke Liao <[email protected]>
Reviewed-by: Sven Zheng <[email protected]>
Cr-Commit-Position: refs/heads/master@{#879234}
diff --git a/testing/buildbot/chromium.chromiumos.json b/testing/buildbot/chromium.chromiumos.json
index 624f182d..00bf0a8 100644
--- a/testing/buildbot/chromium.chromiumos.json
+++ b/testing/buildbot/chromium.chromiumos.json
@@ -4754,7 +4754,7 @@
"gtest_tests": [
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.browser_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.browser_tests.filter"
],
"merge": {
"args": [],
@@ -4782,7 +4782,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.components_unittests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.components_unittests.filter"
],
"merge": {
"args": [],
@@ -4812,7 +4812,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.interactive_ui_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter"
],
"merge": {
"args": [],
@@ -4852,7 +4852,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.sync_integration_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.sync_integration_tests.filter"
],
"merge": {
"args": [],
@@ -4879,7 +4879,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.unit_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.unit_tests.filter"
],
"merge": {
"args": [],
@@ -5061,7 +5061,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.browser_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.browser_tests.filter"
],
"merge": {
"args": [],
@@ -5176,7 +5176,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.components_unittests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.components_unittests.filter"
],
"merge": {
"args": [],
@@ -5203,7 +5203,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.content_browsertests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.content_browsertests.filter"
],
"merge": {
"args": [],
@@ -5417,7 +5417,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.interactive_ui_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter"
],
"merge": {
"args": [],
@@ -5793,7 +5793,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.sync_integration_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.sync_integration_tests.filter"
],
"merge": {
"args": [],
@@ -5844,7 +5844,7 @@
},
{
"args": [
- "--test-launcher-filter-file=../../testing/buildbot/filters/lacros.unit_tests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.unit_tests.filter"
],
"merge": {
"args": [],
diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn
index 65296413..0ba021b 100644
--- a/testing/buildbot/filters/BUILD.gn
+++ b/testing/buildbot/filters/BUILD.gn
@@ -63,8 +63,8 @@
"//testing/buildbot/filters/chromeos.msan.browser_tests.oobe_negative.filter",
"//testing/buildbot/filters/chromeos.msan.browser_tests.oobe_positive.filter",
"//testing/buildbot/filters/code_coverage.browser_tests.filter",
- "//testing/buildbot/filters/lacros.browser_tests.filter",
"//testing/buildbot/filters/linux_bionic.browser_tests.filter",
+ "//testing/buildbot/filters/linux-lacros.browser_tests.filter",
"//testing/buildbot/filters/mac.mac-rel.browser_tests.filter",
"//testing/buildbot/filters/ozone-linux.wayland_browser_tests.filter",
"//testing/buildbot/filters/pixel_browser_tests.filter",
@@ -104,7 +104,7 @@
data = [
"//testing/buildbot/filters/android.emulator_11.components_unittests.filter",
- "//testing/buildbot/filters/lacros.components_unittests.filter",
+ "//testing/buildbot/filters/linux-lacros.components_unittests.filter",
]
}
@@ -120,7 +120,7 @@
"//testing/buildbot/filters/cast-linux.content_browsertests.filter",
"//testing/buildbot/filters/chromium.webrtc.fyi.android.tests.dbg.content_browsertests.filter",
"//testing/buildbot/filters/gpu.skiarenderer_vulkan_content_browsertests.filter",
- "//testing/buildbot/filters/lacros.content_browsertests.filter",
+ "//testing/buildbot/filters/linux-lacros.content_browsertests.filter",
"//testing/buildbot/filters/site_isolation_android.content_browsertests.filter",
"//testing/buildbot/filters/vulkan.content_browsertests.filter",
"//testing/buildbot/filters/ozone-linux.wayland_content_browsertests.filter",
@@ -160,7 +160,7 @@
data = [
"//testing/buildbot/filters/e2e.sync_integration_tests.filter",
- "//testing/buildbot/filters/lacros.sync_integration_tests.filter",
+ "//testing/buildbot/filters/linux-lacros.sync_integration_tests.filter",
]
}
@@ -194,7 +194,7 @@
testonly = true
data = [
- "//testing/buildbot/filters/lacros.interactive_ui_tests.filter",
+ "//testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter",
"//testing/buildbot/filters/ozone-linux.interactive_ui_tests_wayland.filter",
]
}
@@ -241,7 +241,7 @@
data = [
"//testing/buildbot/filters/android.asan.unit_tests.filter",
"//testing/buildbot/filters/bfcache.unit_tests.filter",
- "//testing/buildbot/filters/lacros.unit_tests.filter",
+ "//testing/buildbot/filters/linux-lacros.unit_tests.filter",
"//testing/buildbot/filters/ozone-linux.unit_tests_wayland.filter",
]
}
diff --git a/testing/buildbot/filters/lacros.browser_tests.filter b/testing/buildbot/filters/linux-lacros.browser_tests.filter
similarity index 100%
rename from testing/buildbot/filters/lacros.browser_tests.filter
rename to testing/buildbot/filters/linux-lacros.browser_tests.filter
diff --git a/testing/buildbot/filters/lacros.components_unittests.filter b/testing/buildbot/filters/linux-lacros.components_unittests.filter
similarity index 100%
rename from testing/buildbot/filters/lacros.components_unittests.filter
rename to testing/buildbot/filters/linux-lacros.components_unittests.filter
diff --git a/testing/buildbot/filters/lacros.content_browsertests.filter b/testing/buildbot/filters/linux-lacros.content_browsertests.filter
similarity index 100%
rename from testing/buildbot/filters/lacros.content_browsertests.filter
rename to testing/buildbot/filters/linux-lacros.content_browsertests.filter
diff --git a/testing/buildbot/filters/lacros.interactive_ui_tests.filter b/testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter
similarity index 100%
rename from testing/buildbot/filters/lacros.interactive_ui_tests.filter
rename to testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter
diff --git a/testing/buildbot/filters/lacros.sync_integration_tests.filter b/testing/buildbot/filters/linux-lacros.sync_integration_tests.filter
similarity index 100%
rename from testing/buildbot/filters/lacros.sync_integration_tests.filter
rename to testing/buildbot/filters/linux-lacros.sync_integration_tests.filter
diff --git a/testing/buildbot/filters/lacros.unit_tests.filter b/testing/buildbot/filters/linux-lacros.unit_tests.filter
similarity index 100%
rename from testing/buildbot/filters/lacros.unit_tests.filter
rename to testing/buildbot/filters/linux-lacros.unit_tests.filter
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index 6c36bc0..f5a0268 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -744,12 +744,12 @@
},
'linux-lacros-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.browser_tests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.browser_tests.filter',
],
},
'linux-lacros-tester-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.browser_tests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.browser_tests.filter',
],
},
'linux-trusty-rel': {
@@ -1150,13 +1150,13 @@
# https://crbug.com/1111979,
'linux-lacros-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.components_unittests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.components_unittests.filter',
],
},
# https://crbug.com/1111979,
'linux-lacros-tester-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.components_unittests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.components_unittests.filter',
],
},
},
@@ -1325,7 +1325,7 @@
# https://crbug.com/1111979,
'linux-lacros-tester-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.content_browsertests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.content_browsertests.filter',
],
},
},
@@ -1837,13 +1837,13 @@
# https://crbug.com/1111979
'linux-lacros-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.interactive_ui_tests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter',
],
},
# https://crbug.com/1111979
'linux-lacros-tester-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.interactive_ui_tests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.interactive_ui_tests.filter',
],
},
},
@@ -2688,12 +2688,12 @@
# https://crbug.com/1199909,
'linux-lacros-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.sync_integration_tests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.sync_integration_tests.filter',
]
},
'linux-lacros-tester-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.sync_integration_tests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.sync_integration_tests.filter',
],
},
},
@@ -2938,13 +2938,13 @@
# https://crbug.com/1111979,
'linux-lacros-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.unit_tests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.unit_tests.filter',
],
},
# https://crbug.com/1111979,
'linux-lacros-tester-rel': {
'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/lacros.unit_tests.filter',
+ '--test-launcher-filter-file=../../testing/buildbot/filters/linux-lacros.unit_tests.filter',
],
},
},
