ozone/x11: content_browsertests: remove filter file
All the tests from the filter pass now. Enable them back.
Bug: 1040382
Change-Id: I3e7b2d926fabc3f8e0028a2668fc2c5667c5ea5e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2444315
Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#813640}
diff --git a/testing/buildbot/chromium.linux.json b/testing/buildbot/chromium.linux.json
index b1957bf..ca7efbb 100644
--- a/testing/buildbot/chromium.linux.json
+++ b/testing/buildbot/chromium.linux.json
@@ -4906,8 +4906,7 @@
{
"args": [
"--ozone-platform=x11",
- "--enable-features=UseOzonePlatform",
- "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_content_browsertests.filter"
+ "--enable-features=UseOzonePlatform"
],
"merge": {
"args": [],
diff --git a/testing/buildbot/filters/BUILD.gn b/testing/buildbot/filters/BUILD.gn
index 11a9329..ba29e82 100644
--- a/testing/buildbot/filters/BUILD.gn
+++ b/testing/buildbot/filters/BUILD.gn
@@ -93,7 +93,6 @@
"//testing/buildbot/filters/site_isolation_android.content_browsertests.filter",
"//testing/buildbot/filters/skia_renderer.content_browsertests.filter",
"//testing/buildbot/filters/vulkan.content_browsertests.filter",
- "//testing/buildbot/filters/ozone-linux.x11_content_browsertests.filter",
"//testing/buildbot/filters/ozone-linux.wayland_content_browsertests.filter",
]
}
diff --git a/testing/buildbot/filters/ozone-linux.x11_content_browsertests.filter b/testing/buildbot/filters/ozone-linux.x11_content_browsertests.filter
deleted file mode 100644
index d0745f95..0000000
--- a/testing/buildbot/filters/ozone-linux.x11_content_browsertests.filter
+++ /dev/null
@@ -1,7 +0,0 @@
-# Fix these failures: https://crbug.com/1040382
-
-# Crashing tests
--TouchSelectionForCrossProcessFramesTests/TouchSelectionControllerClientAuraSiteIsolationTest.BasicSelectionIsolatedIframe/0
--TouchSelectionForCrossProcessFramesTests/TouchSelectionControllerClientAuraSiteIsolationTest.BasicSelectionIsolatedIframe/1
--TouchSelectionForCrossProcessFramesTests/TouchSelectionControllerClientAuraSiteIsolationTest.BasicSelectionIsolatedScrollMainframe/0
--TouchSelectionForCrossProcessFramesTests/TouchSelectionControllerClientAuraSiteIsolationTest.BasicSelectionIsolatedScrollMainframe/1
diff --git a/testing/buildbot/test_suite_exceptions.pyl b/testing/buildbot/test_suite_exceptions.pyl
index b97732e..f81bbb8c 100644
--- a/testing/buildbot/test_suite_exceptions.pyl
+++ b/testing/buildbot/test_suite_exceptions.pyl
@@ -1041,15 +1041,6 @@
},
},
},
- 'content_browsertests_x11': {
- 'modifications': {
- 'Linux Ozone Tester (X11)': {
- 'args': [
- '--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_content_browsertests.filter',
- ],
- },
- },
- },
'content_shell_crash_test': {
'remove_from': [
'android-marshmallow-x86-rel-non-cq', # crbug.com/1084353
