Changeset 263261 in webkit

Timestamp:

Jun 19, 2020, 6:18:21 AM (6 years ago)

Author:

Lauro Moura

Message:

[webkitpy][WPE] Default to headless if _display_server is xfvb
​https://bugs.webkit.org/show_bug.cgi?id=213327

Reviewed by Philippe Normand.

Xvfb is used as the default display server for some scripts, and the
equivalent for WPE is the headless one.

WTR and the API tests already create only HeadlessViewBackends, but the
WebDriver tests create them through MiniBrowser, which requires the
'--headless' parameter.

• Scripts/run-webdriver-tests: Do not override _display_server
• Scripts/webkitpy/port/base.py:

(Port.init): Define _display_server for all ports to avoid
eventually needing to override it.

• Scripts/webkitpy/port/wpe.py:

(WPEPort.init): Default to 'headless' if _display_server is 'xvfb'

• Scripts/webkitpy/w3c/wpt_runner.py:

(main): Dot not override _display_server

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/run-webdriver-tests (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (1 diff)
• Scripts/webkitpy/port/wpe.py (modified) (1 diff)
• Scripts/webkitpy/w3c/wpt_runner.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-06-19  Lauro Moura  <lmoura@igalia.com>
+
+        [webkitpy][WPE] Default to headless if _display_server is xfvb
+        https://bugs.webkit.org/show_bug.cgi?id=213327
+
+        Reviewed by Philippe Normand.
+
+        Xvfb is used as the default display server for some scripts, and the
+        equivalent for WPE is the headless one.
+
+        WTR and the API tests already create only HeadlessViewBackends, but the
+        WebDriver tests create them through MiniBrowser, which requires the
+        '--headless' parameter.
+
+        * Scripts/run-webdriver-tests: Do not override _display_server
+        * Scripts/webkitpy/port/base.py:
+        (Port.__init__): Define _display_server for all ports to avoid
+        eventually needing to override it.
+        * Scripts/webkitpy/port/wpe.py:
+        (WPEPort.__init__): Default to 'headless' if _display_server is 'xvfb'
+        * Scripts/webkitpy/w3c/wpt_runner.py:
+        (main): Dot not override _display_server
+
 2020-06-19  Carlos Garcia Campos  <cgarcia@igalia.com>
 

trunk/Tools/Scripts/run-webdriver-tests

@@ -82 +82 @@
             print '***'
 
-port._display_server = options.display_server
 runner = WebDriverTestRunner(port)
 runner.run(args)

trunk/Tools/Scripts/webkitpy/port/base.py

@@ -144 +144 @@
         self._layout_tests_dir = hasattr(options, 'layout_tests_dir') and options.layout_tests_dir and self._filesystem.abspath(options.layout_tests_dir)
         self._w3c_resource_files = None
+        self._display_server = None
 
     def target_host(self, worker_number=None):

trunk/Tools/Scripts/webkitpy/port/wpe.py

@@ -43 +43 @@
 
         self._display_server = self.get_option("display_server")
+        if self._display_server == 'xvfb':
+            # While not supported by WPE, xvfb is used as the default value in the main scripts
+            self._display_server = 'headless'
         if self._should_use_jhbuild():
             self._jhbuild_wrapper = [self.path_from_webkit_base('Tools', 'jhbuild', 'jhbuild-wrapper'), '--wpe', 'run']

trunk/Tools/Scripts/webkitpy/w3c/wpt_runner.py

@@ -79 +79 @@
 
     # Create the Port-specific driver.
-    port._display_server = options.display_server
     display_driver = port.create_driver(worker_number=0, no_timeout=True)._make_driver(pixel_tests=False)
     if not display_driver.check_driver(port):