Changeset 169344 in webkit


Ignore:
Timestamp:
May 26, 2014 7:19:51 AM (10 years ago)
Author:
commit-queue@webkit.org
Message:

[GTK] Allow to run the tests on the native X display.
https://bugs.webkit.org/show_bug.cgi?id=133157

Patch by Carlos Alberto Lopez Perez <clopez@igalia.com> on 2014-05-26
Reviewed by Benjamin Poulain.

This adds a new driver (xorgdriver) that runs the tests on the
X display referenced by the environment variable DISPLAY.

This new driver will be activated only if the environment variable
USE_NATIVE_XDISPLAY is defined. This can be used both for layout
tests and performance tests.

This patch also makes the script run-perf-tests to check the
system dependencies before starting the tests. Previously this
was not checked, and if the system dependencies were not met,
the script tried to execute the tests anyway, causing massive
failures. For example, if you had Xvfb not installed and you
wanted to use the Xvfb driver (the default on GTK and EFL),
run-perf-tests would not abort.

  • Scripts/webkitpy/performance_tests/perftestsrunner.py:

(PerfTestsRunner._parse_args): Check the system dependencies of
the driver before starting the tests.

  • Scripts/webkitpy/port/driver.py:

(Driver): Implement generic check_driver method.
(Driver.check_driver):
(Driver.check_driver.implementation):

  • Scripts/webkitpy/port/gtk.py:

(GtkPort._driver_class): Check for environment variable
USE_NATIVE_XDISPLAY to decide if the Xorg driver should be used.

  • Scripts/webkitpy/port/xorgdriver.py: Added.

(XorgDriver): Implement Xorg driver.
(XorgDriver.check_driver):
(XorgDriver._start):

Location:
trunk/Tools
Files:
1 added
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r169343 r169344  
     12014-05-26  Carlos Alberto Lopez Perez  <clopez@igalia.com>
     2
     3        [GTK] Allow to run the tests on the native X display.
     4        https://bugs.webkit.org/show_bug.cgi?id=133157
     5
     6        Reviewed by Benjamin Poulain.
     7
     8        This adds a new driver (xorgdriver) that runs the tests on the
     9        X display referenced by the environment variable DISPLAY.
     10
     11        This new driver will be activated only if the environment variable
     12        USE_NATIVE_XDISPLAY is defined. This can be used both for layout
     13        tests and performance tests.
     14
     15        This patch also makes the script run-perf-tests to check the
     16        system dependencies before starting the tests. Previously this
     17        was not checked, and if the system dependencies were not met,
     18        the script tried to execute the tests anyway, causing massive
     19        failures. For example, if you had Xvfb not installed and you
     20        wanted to use the Xvfb driver (the default on GTK and EFL),
     21        run-perf-tests would not abort.
     22
     23        * Scripts/webkitpy/performance_tests/perftestsrunner.py:
     24        (PerfTestsRunner._parse_args): Check the system dependencies of
     25        the driver before starting the tests.
     26        * Scripts/webkitpy/port/driver.py:
     27        (Driver): Implement generic check_driver method.
     28        (Driver.check_driver):
     29        (Driver.check_driver.implementation):
     30        * Scripts/webkitpy/port/gtk.py:
     31        (GtkPort._driver_class): Check for environment variable
     32        USE_NATIVE_XDISPLAY to decide if the Xorg driver should be used.
     33        * Scripts/webkitpy/port/xorgdriver.py: Added.
     34        (XorgDriver): Implement Xorg driver.
     35        (XorgDriver.check_driver):
     36        (XorgDriver._start):
     37
    1382014-05-26  Carlos Alberto Lopez Perez  <clopez@igalia.com>
    239
  • trunk/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py

    r165782 r169344  
    179179            return self.EXIT_CODE_BAD_BUILD
    180180
     181        # Check that the system dependencies (themes, fonts, ...) are correct.
     182        if not self._port.check_sys_deps(needs_http=False):
     183            _log.error("Failed to check system dependencies.")
     184            self._port.stop_helper()
     185            return self.EXIT_CODE_BAD_PREPARATION
     186
    181187        run_count = 0
    182188        repeat = self._options.repeat
  • trunk/Tools/Scripts/webkitpy/port/driver.py

    r160459 r169344  
    490490        return block
    491491
     492    @staticmethod
     493    def check_driver(port):
     494        # This checks if the required system dependencies for the driver are met.
     495        # Since this is the generic class implementation, just return True.
     496        return True
     497
    492498
    493499class ContentBlock(object):
  • trunk/Tools/Scripts/webkitpy/port/gtk.py

    r168894 r169344  
    3838from webkitpy.port.xvfbdriver import XvfbDriver
    3939from webkitpy.port.westondriver import WestonDriver
     40from webkitpy.port.xorgdriver import XorgDriver
    4041from webkitpy.port.linux_get_crash_log import GDBCrashLogGenerator
    4142from webkitpy.port.leakdetector_valgrind import LeakDetectorValgrind
     
    7071        if os.environ.get("WAYLAND_DISPLAY"):
    7172            return WestonDriver
     73        if os.environ.get("USE_NATIVE_XDISPLAY"):
     74            return XorgDriver
    7275        return XvfbDriver
    7376
Note: See TracChangeset for help on using the changeset viewer.