ozone/wayland: update xvfb.py to be able to spawn weston_proc

Previously, we thought we should run weston inside xvfb with x11 backend. But it turned out the headless-backend serves our needs quite well as well. Thus, update the xvfb script to be able to spawn weston proc and make sure xvfb is not used if --use-weston is passed.

Bug: 1029241

Change-Id: I81658700259d10b3f82cbf492c5eddd39f5bf63b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2056543
Commit-Queue: Maksim Sisov <msisov@igalia.com>
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Reviewed-by: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#749096}

testing/buildbot/chromium.linux.json

@@ -2513,18 +2513,19 @@
     ]
   },
   "Linux Ozone Tester (Wayland)": {
-    "gtest_tests": []
-  },
-  "Linux Ozone Tester (X11)": {
     "gtest_tests": [
       {
         "args": [
-          "--ozone-platform=x11"
+          "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_views_unittests.filter",
+          "--no-xvfb",
+          "--use-weston",
+          "--ozone-platform=wayland"
         ],
         "merge": {
           "args": [],
           "script": "//testing/merge_scripts/standard_gtest_merge.py"
         },
+        "name": "wayland_views_unittests",
         "swarming": {
           "can_use_on_swarming_builders": true,
           "dimension_sets": [
@@ -2533,9 +2534,13 @@
             }
           ]
         },
-        "test": "content_unittests",
-        "test_target": "//content/test:content_unittests"
-      },
+        "test": "views_unittests",
+        "test_target": "//ui/views:views_unittests"
+      }
+    ]
+  },
+  "Linux Ozone Tester (X11)": {
+    "gtest_tests": [
       {
         "args": [
           "--ozone-platform=x11"
@@ -2552,8 +2557,8 @@
             }
           ]
         },
-        "test": "ozone_unittests",
-        "test_target": "//ui/ozone:ozone_unittests"
+        "test": "content_unittests",
+        "test_target": "//content/test:content_unittests"
       },
       {
         "args": [
@@ -2574,25 +2579,6 @@
         "test": "ozone_x11_unittests",
         "test_target": "//ui/ozone:ozone_x11_unittests"
       },
-      {
-        "args": [
-          "--ozone-platform=x11"
-        ],
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Ubuntu-16.04"
-            }
-          ]
-        },
-        "test": "services_unittests",
-        "test_target": "//services:services_unittests"
-      },
       {
         "args": [
           "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_views_unittests.filter",
@@ -6214,26 +6200,6 @@
         "test": "content_unittests",
         "test_target": "//content/test:content_unittests"
       },
-      {
-        "args": [
-          "--ozone-platform=x11"
-        ],
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "name": "x11_content_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Ubuntu-16.04"
-            }
-          ]
-        },
-        "test": "content_unittests",
-        "test_target": "//content/test:content_unittests"
-      },
       {
         "experiment_percentage": 100,
         "merge": {
@@ -6267,22 +6233,6 @@
         "test": "ozone_unittests",
         "test_target": "//ui/ozone:ozone_unittests"
       },
-      {
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Ubuntu-16.04"
-            }
-          ]
-        },
-        "test": "ozone_x11_unittests",
-        "test_target": "//ui/ozone:ozone_x11_unittests"
-      },
       {
         "merge": {
           "args": [],
@@ -6298,27 +6248,6 @@
         },
         "test": "services_unittests",
         "test_target": "//services:services_unittests"
-      },
-      {
-        "args": [
-          "--ozone-platform=x11",
-          "--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_views_unittests.filter"
-        ],
-        "merge": {
-          "args": [],
-          "script": "//testing/merge_scripts/standard_gtest_merge.py"
-        },
-        "name": "x11_views_unittests",
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "os": "Ubuntu-16.04"
-            }
-          ]
-        },
-        "test": "views_unittests",
-        "test_target": "//ui/views:views_unittests"
       }
     ]
   },

testing/buildbot/filters/BUILD.gn

@@ -151,7 +151,10 @@ source_set("interactive_ui_tests_filters") {
 }
 
 source_set("linux_ozone_views_unittests_filters") {
-  data = [ "//testing/buildbot/filters/ozone-linux.x11_views_unittests.filter" ]
+  data = [
+    "//testing/buildbot/filters/ozone-linux.x11_views_unittests.filter",
+    "//testing/buildbot/filters/ozone-linux.wayland_views_unittests.filter",
+  ]
 }
 
 source_set("linux_trusty_rel_browser_tests_filters") {

testing/buildbot/filters/ozone-linux.wayland_views_unittests.filter

+# https://crbug.com/ : Fix this failed and crashed tests.
+
+# Failed tests.
+-DesktopWidgetFocusManagerTest.AnchoredDialogInDesktopNativeWidgetAura
+-DesktopWidgetTest.GetWindowPlacement
+-EditableComboboxTest.AltLeftOrRightDoesNothing
+-EditableComboboxTest.CtrlLeftOrRightMovesToNextWords
+-EditableComboboxTest.EndOrHomeMovesToBeginningOrEndOfText
+-EditableComboboxTest.EnterClosesMenuWhileSelectingHighlightedMenuItem
+-EditableComboboxTest.EscClosesMenuWithoutSelectingHighlightedMenuItem
+-EditableComboboxTest.F4ClosesMenuWhileSelectingHighlightedMenuItem
+-EditableComboboxTest.LeftOrRightKeysMoveInTextfield
+-EditableComboboxTest.MenuCanAdaptToContentChange
+-EditableComboboxTest.RefocusingReopensMenuBasedOnLatestContent
+-EditableComboboxTest.ShiftLeftOrRightSelectsCharInTextfield
+-EditableComboboxTest.SpaceIsReflectedInTextfield
+-EditableComboboxTest.TypingInTextfieldUnhighlightsMenuItem
+-EditableComboboxTest.UpOrDownKeysMoveInMenu
+-MenuRunnerTest.LatinMnemonic
+-TextfieldTest.ContextMenuDisplayTest
+-TextfieldTest.ControlAndSelectTest
+-TextfieldTest.CursorMovement
+-TextfieldTest.CursorViewHeight
+-TextfieldTest.CutCopyPasteWithEditCommand
+-TextfieldTest.InsertionDeletionTest
+-TextfieldTest.KeyTest
+-TextfieldTest.KeyTestControlModifier
+-TextfieldTest.OnKeyPressBinding
+-TextfieldTest.OverflowInRTLTest
+-TextfieldTest.OverflowTest
+-TextfieldTest.OvertypeMode
+-TextfieldTest.RedoWithCtrlY
+-TextfieldTest.SwitchFocusInKeyDown
+-TextfieldTest.TextCursorDisplayInRTLTest
+-TextfieldTest.TextCursorDisplayTest
+-TextfieldTest.TextCursorPositionInLTRTest
+-TextfieldTest.TextCursorPositionInRTLTest
+-TextfieldTest.TextInputType_InsertionTest
+-TextfieldTest.TextfieldBoundsChangeTest
+-TextfieldTest.UndoRedoTest
+-TooltipControllerTest.DontShowTooltipOnTouch
+-TooltipControllerTest.EnableOrDisableTooltips
+-TooltipControllerTest.HideEmptyTooltip
+-TooltipControllerTest.HideOnExit
+-TooltipControllerTest.ReshowOnClickAfterEnterExit
+-TooltipControllerTest.TooltipHidesOnKeyPressAndStaysHiddenUntilChange
+-TooltipControllerTest.TooltipHidesOnTimeoutAndStaysHiddenUntilChange
+-TooltipControllerTest.TooltipsInMultipleViews
+-TooltipControllerTest.ViewTooltip
+
+# Crashed tests.
+-DesktopWidgetTest.MinimumSizeConstraints
+-TooltipControllerCaptureTest.Capture
+

testing/buildbot/test_suites.pyl

@@ -3209,9 +3209,9 @@
       },
     },
 
-    'ozone_linux_gtests': {
+    'ozone_linux_gtests_headless': {
       'events_unittests': {
-	'experiment_percentage': 100,
+        'experiment_percentage': 100,
       },
       'headless_content_unittests': {
         'args': [
@@ -3220,32 +3220,21 @@
         'test': 'content_unittests',
       },
       'ozone_unittests': {},
-      'ozone_x11_unittests': {},
       'services_unittests': {},
-      'x11_content_unittests': {
-        'args': [
-          '--ozone-platform=x11',
-        ],
-        'test': 'content_unittests',
-      },
-      'x11_views_unittests': {
+    },
+
+    'ozone_linux_gtests_wayland': {
+      'wayland_views_unittests': {
         'args': [
-          '--ozone-platform=x11',
-          '--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_views_unittests.filter',
+          '--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.wayland_views_unittests.filter',
         ],
         'test': 'views_unittests',
       }
     },
 
-    'ozone_linux_gtests_wayland': {
-      # TODO(crbug.com/1029241): Add tests once third_party weston is added.
-    },
-
     'ozone_linux_gtests_x11': {
       'content_unittests': {},
-      'ozone_unittests': {},
       'ozone_x11_unittests': {},
-      'services_unittests': {},
       'views_unittests': {
         'args': [
           '--test-launcher-filter-file=../../testing/buildbot/filters/ozone-linux.x11_views_unittests.filter',

testing/buildbot/waterfalls.pyl

@@ -3657,7 +3657,11 @@
         ]
       },
       'Linux Ozone Tester (Wayland)': {
-        'args': [ '--ozone-platform=wayland' ],
+        'args': [
+          '--no-xvfb',
+          '--use-weston',
+          '--ozone-platform=wayland'
+        ],
         'mixins': [
           'linux-xenial',
          ],
@@ -3731,7 +3735,7 @@
           'chrome',
         ],
         'test_suites': {
-          'gtest_tests': 'ozone_linux_gtests',
+          'gtest_tests': 'ozone_linux_gtests_headless',
         },
       },
       'linux-trusty-rel': {