Attachment 339568 Details for Bug 185054 – Patch

[patch] Patch

bug-185054-20180504111020.patch (text/plain), 2.04 KB, created by Daniel Bates on 2018-05-04 11:10:21 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Bates

Created: 2018-05-04 11:10:21 PDT

Size: 2.04 KB

patch

obsolete

>Subversion Revision: 231355
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 717973039824042379641466e7e4990a1c720936..c7647e61788748b7c17287834eff35ee2a54e896 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-05-04  Daniel Bates  <dabates@apple.com>
>+
>+        REGRESSION (r229955): run-webkit-tests runs tests in skipped directories and subdirectories of directory given on command line
>+        https://bugs.webkit.org/show_bug.cgi?id=185054
>+        <rdar://problem/39773209>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Fallback to MacPort.CURRENT_VERSION if we are not using a known named macOS and do not have Apple Additions.
>+
>+        Darwin-based ports have OS version-specific test expectations and are certified to support running tests using
>+        the currently shipping OS by way of a hardcoded class variable CURRENT_VERSION. The run-webkit-tests script
>+        depends on the OS version to find the applicable TestExpectations files to parse to compute the list of skipped
>+        tests for the port.
>+
>+        * Scripts/webkitpy/port/mac.py:
>+        (MacPort.__init__):
>+
> 2018-05-04  Carlos Garcia Campos  <cgarcia@igalia.com>
> 
>         [GTK] Epiphany (GNOME Web) says "Error downloading: Service Unavailable." when trying to download an image from discogs.com
>diff --git a/Tools/Scripts/webkitpy/port/mac.py b/Tools/Scripts/webkitpy/port/mac.py
>index 710a810412fa1e529c2416e1cc4f167be952482c..f2d761e82ea2d8ab2d0fb1be22e59554b57f520c 100644
>--- a/Tools/Scripts/webkitpy/port/mac.py
>+++ b/Tools/Scripts/webkitpy/port/mac.py
>@@ -60,7 +60,7 @@ class MacPort(DarwinPort):
>         split_port_name = port_name.split('-')
>         if len(split_port_name) > 1 and split_port_name[1] != 'wk2':
>             self._os_version = version_name_map.from_name(split_port_name[1])[1]
>-        elif self.host.platform.is_mac():
>+        elif self.host.platform.is_mac() and apple_additions():
>             self._os_version = self.host.platform.os_version
>         if not self._os_version:
>             self._os_version = MacPort.CURRENT_VERSION

Actions: View | Formatted Diff | Diff

Attachments on bug 185054: 339568 | 339574