Suppress 2 cc_unittests failures on SkiaRenderer Dawn
Also fixes having multiple test-launcher-filter-file in buidbot JSON.
As well as parsing multiple test-launcher-filter-file on Android.
TBR=bsheedy
Bug: 1139118
Change-Id: I5c27b358286cdb66402ec75a0409e2e8fb900ae5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2476837
Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#818051}
GitOrigin-RevId: 8c487e7e12498a0a2123c2ff35ac050f95511fa6
diff --git a/buildbot/chromium.android.fyi.json b/buildbot/chromium.android.fyi.json
index e29b1b7..36b9254 100644
--- a/buildbot/chromium.android.fyi.json
+++ b/buildbot/chromium.android.fyi.json
@@ -2708,9 +2708,8 @@
{
"args": [
"--enable-features=NetworkService,NetworkServiceInProcess",
- "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_webview_instrumentation_test_apk.filter",
- "--avd-config=../../tools/android/avd/proto/generic_android28.textpb",
- "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_webview_instrumentation_test_apk.filter;../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter",
+ "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
],
"merge": {
"args": [],
diff --git a/buildbot/chromium.android.json b/buildbot/chromium.android.json
index 79aeb81..3c92510 100644
--- a/buildbot/chromium.android.json
+++ b/buildbot/chromium.android.json
@@ -42851,11 +42851,10 @@
{
"args": [
"--enable-features=NetworkService,NetworkServiceInProcess",
- "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_webview_instrumentation_test_apk.filter",
+ "--test-launcher-filter-file=../../testing/buildbot/filters/mojo.fyi.network_webview_instrumentation_test_apk.filter;../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter",
"--gs-results-bucket=chromium-result-details",
"--recover-devices",
- "--avd-config=../../tools/android/avd/proto/generic_android28.textpb",
- "--test-launcher-filter-file=../../testing/buildbot/filters/android.emulator.webview_instrumentation_test_apk.filter"
+ "--avd-config=../../tools/android/avd/proto/generic_android28.textpb"
],
"merge": {
"args": [
diff --git a/buildbot/chromium.gpu.fyi.json b/buildbot/chromium.gpu.fyi.json
index 5ef1182..781bf61 100644
--- a/buildbot/chromium.gpu.fyi.json
+++ b/buildbot/chromium.gpu.fyi.json
@@ -13146,8 +13146,8 @@
"gtest_tests": [
{
"args": [
- "--no-xvfb",
- "--test-launcher-filter-file=../../testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter"
+ "--test-launcher-filter-file=../../testing/buildbot/filters/gpu.skiarenderer_dawn_cc_unittests.filter;../../testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter",
+ "--no-xvfb"
],
"merge": {
"args": [],
@@ -31923,6 +31923,9 @@
"Win10 FYI x64 SkiaRenderer Dawn Release (NVIDIA)": {
"gtest_tests": [
{
+ "args": [
+ "--test-launcher-filter-file=../../testing/buildbot/filters/gpu.skiarenderer_dawn_cc_unittests.filter"
+ ],
"merge": {
"args": [],
"script": "//testing/merge_scripts/standard_gtest_merge.py"
diff --git a/buildbot/filters/BUILD.gn b/buildbot/filters/BUILD.gn
index 7e5ed05..17411e1 100644
--- a/buildbot/filters/BUILD.gn
+++ b/buildbot/filters/BUILD.gn
@@ -22,6 +22,7 @@
data = [
"//testing/buildbot/filters/android.emulator.cc_unittests.filter",
"//testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter",
+ "//testing/buildbot/filters/gpu.skiarenderer_dawn_cc_unittests.filter",
]
}
diff --git a/buildbot/filters/gpu.skiarenderer_dawn_cc_unittests.filter b/buildbot/filters/gpu.skiarenderer_dawn_cc_unittests.filter
new file mode 100644
index 0000000..31e6b40
--- /dev/null
+++ b/buildbot/filters/gpu.skiarenderer_dawn_cc_unittests.filter
@@ -0,0 +1,3 @@
+# crbug.com/1139118: new blur algorithm
+-All/LayerTreeHostFiltersPixelTest.BackdropFilterBlurRadius/SkiaDawn
+-All/LayerTreeHostFiltersPixelTest.BackdropFilterRotated/SkiaDawn
diff --git a/buildbot/generate_buildbot_json.py b/buildbot/generate_buildbot_json.py
index b967485..607f48b 100755
--- a/buildbot/generate_buildbot_json.py
+++ b/buildbot/generate_buildbot_json.py
@@ -460,6 +460,7 @@
# --extra-browser-args=arg1 arg2
arr = self.merge_command_line_args(arr, '--enable-features=', ',')
arr = self.merge_command_line_args(arr, '--extra-browser-args=', ' ')
+ arr = self.merge_command_line_args(arr, '--test-launcher-filter-file=', ';')
return arr
def substitute_magic_args(self, test_config):
diff --git a/buildbot/test_suites.pyl b/buildbot/test_suites.pyl
index d859e2e..2ff2794 100644
--- a/buildbot/test_suites.pyl
+++ b/buildbot/test_suites.pyl
@@ -2555,6 +2555,9 @@
'--no-xvfb',
'--test-launcher-filter-file=../../testing/buildbot/filters/gpu.linux.skiarenderer_dawn_cc_unittests.filter',
],
+ 'args': [
+ '--test-launcher-filter-file=../../testing/buildbot/filters/gpu.skiarenderer_dawn_cc_unittests.filter',
+ ],
},
'viz_unittests': {
'linux_args': [
