Changeset 261383 in webkit


Ignore:
Timestamp:
May 8, 2020 8:21:57 AM (4 years ago)
Author:
Lauro Moura
Message:

[GTK][WPE] Create common glib expectation file
​https://bugs.webkit.org/show_bug.cgi?id=211183

Reviewed by Carlos Garcia Campos.

Tools:

  • Scripts/webkitpy/port/gtk.py:

(GtkPort._search_paths): Add glib to expectations search path
(GtkPort.test_expectations_file_position): Update test

  • Scripts/webkitpy/port/gtk_unittest.py:

(GtkPortTest.test_default_baseline_search_path): Update test
(GtkPortTest.test_port_specific_expectations_files): Update test and
make check-webkit-style happier

  • Scripts/webkitpy/port/wpe.py:

(WPEPort._search_paths): Add glib to expectations search path
(WPEPort.test_expectations_file_position): Update test

  • Scripts/webkitpy/port/wpe_unittest.py:

(WPEPortTest.test_default_baseline_search_path): Update test
(WPEPortTest.test_port_specific_expectations_files): Update test and
make check-webkit-style happier

LayoutTests:

  • platform/glib/TestExpectations: Added.
Location:
trunk
Files:
2 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r261382 r261383  
     12020-05-08  Lauro Moura  <lmoura@igalia.com>
     2
     3        [GTK][WPE] Create common glib expectation file
     4        https://bugs.webkit.org/show_bug.cgi?id=211183
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * platform/glib/TestExpectations: Added.
     9
    1102020-05-08  Simon Fraser  <simon.fraser@apple.com>
    211

  • trunk/Tools/ChangeLog

    r261374 r261383  
     12020-05-08  Lauro Moura  <lmoura@igalia.com>
     2
     3        [GTK][WPE] Create common glib expectation file
     4        https://bugs.webkit.org/show_bug.cgi?id=211183
     5
     6        Reviewed by Carlos Garcia Campos.
     7
     8        * Scripts/webkitpy/port/gtk.py:
     9        (GtkPort._search_paths): Add glib to expectations search path
     10        (GtkPort.test_expectations_file_position): Update test
     11        * Scripts/webkitpy/port/gtk_unittest.py:
     12        (GtkPortTest.test_default_baseline_search_path): Update test
     13        (GtkPortTest.test_port_specific_expectations_files): Update test and
     14        make check-webkit-style happier
     15        * Scripts/webkitpy/port/wpe.py:
     16        (WPEPort._search_paths): Add glib to expectations search path
     17        (WPEPort.test_expectations_file_position): Update test
     18        * Scripts/webkitpy/port/wpe_unittest.py:
     19        (WPEPortTest.test_default_baseline_search_path): Update test
     20        (WPEPortTest.test_port_specific_expectations_files): Update test and
     21        make check-webkit-style happier
     22
    1232020-05-08  Paulo Matos  <pmatos@igalia.com>
    224

  • trunk/Tools/Scripts/webkitpy/port/gtk.py

    r261078 r261383  
    210210            search_paths.append(self.port_name + "-wayland")
    211211        search_paths.append(self.port_name)
     212        search_paths.append('glib')
    212213        search_paths.append('wk2')
    213214        search_paths.extend(self.get_option("additional_platform_directory", []))
    … …  
    241242
    242243    def test_expectations_file_position(self):
    243         # GTK port baseline search path is gtk -> wk2 -> generic (as gtk-wk2 and gtk baselines are merged), so port test expectations file is at third to last position.
    244         return 2
     244        # GTK port baseline search path is gtk -> glib -> wk2 -> generic (as gtk-wk2 and gtk baselines are merged), so port test expectations file is at third to last position.
     245        return 3
    245246
    246247    def build_webkit_command(self, build_style=None):

  • trunk/Tools/Scripts/webkitpy/port/gtk_unittest.py

    r251661 r261383  
    5454    def test_default_baseline_search_path(self):
    5555        port = self.make_port()
    56         self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/gtk',
    57             '/mock-checkout/LayoutTests/platform/wk2'])
     56        self.assertEqual(port.default_baseline_search_path(),
     57                         ['/mock-checkout/LayoutTests/platform/gtk',
     58                          '/mock-checkout/LayoutTests/platform/glib',
     59                          '/mock-checkout/LayoutTests/platform/wk2'])
    5860
    5961    def test_port_specific_expectations_files(self):
    6062        port = self.make_port()
    61         self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
    62             '/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
    63             '/mock-checkout/LayoutTests/platform/gtk/TestExpectations'])
     63        self.assertEqual(port.expectations_files(),
     64                         ['/mock-checkout/LayoutTests/TestExpectations',
     65                          '/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
     66                          '/mock-checkout/LayoutTests/platform/glib/TestExpectations',
     67                          '/mock-checkout/LayoutTests/platform/gtk/TestExpectations'])
    6468
    6569    def test_show_results_html_file(self):

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

    r260947 r261383  
    112112
    113113    def _search_paths(self):
    114         return [self.port_name, 'wk2'] + self.get_option("additional_platform_directory", [])
     114        return [self.port_name, 'glib', 'wk2'] + self.get_option("additional_platform_directory", [])
    115115
    116116    def default_baseline_search_path(self, **kwargs):
    … …  
    121121
    122122    def test_expectations_file_position(self):
    123         # WPE port baseline search path is wpe -> wk2 -> generic, so port test expectations file is at third to last position.
    124         return 2
     123        # WPE port baseline search path is wpe -> glib -> wk2 -> generic, so port test expectations file is at third to last position.
     124        return 3
    125125
    126126    def _get_crash_log(self, name, pid, stdout, stderr, newer_than, target_host=None):

  • trunk/Tools/Scripts/webkitpy/port/wpe_unittest.py

    r251661 r261383  
    5555    def test_default_baseline_search_path(self):
    5656        port = self.make_port()
    57         self.assertEqual(port.default_baseline_search_path(), ['/mock-checkout/LayoutTests/platform/wpe',
    58             '/mock-checkout/LayoutTests/platform/wk2'])
     57        self.assertEqual(port.default_baseline_search_path(),
     58                         ['/mock-checkout/LayoutTests/platform/wpe',
     59                          '/mock-checkout/LayoutTests/platform/glib',
     60                          '/mock-checkout/LayoutTests/platform/wk2'])
    5961
    6062    def test_port_specific_expectations_files(self):
    6163        port = self.make_port()
    62         self.assertEqual(port.expectations_files(), ['/mock-checkout/LayoutTests/TestExpectations',
    63             '/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
    64             '/mock-checkout/LayoutTests/platform/wpe/TestExpectations'])
     64        self.assertEqual(port.expectations_files(),
     65                         ['/mock-checkout/LayoutTests/TestExpectations',
     66                          '/mock-checkout/LayoutTests/platform/wk2/TestExpectations',
     67                          '/mock-checkout/LayoutTests/platform/glib/TestExpectations',
     68                          '/mock-checkout/LayoutTests/platform/wpe/TestExpectations'])
    6569
    6670    def test_default_timeout_ms(self):
Note: See TracChangeset for help on using the changeset viewer.