Changeset 229116 in webkit

Timestamp:

Feb 28, 2018, 6:09:39 PM (7 years ago)

Author:

Jonathan Bedard

Message:

[webkitpy] Remove concept of 'future' versions (Follow-up fix 2)
​https://bugs.webkit.org/show_bug.cgi?id=183184
<rdar://problem/37958594>

Reviewed by Aakash Jain.

Unlisted Apple versions can't run webkitpy tests because they don't
have specified port names.

• Scripts/webkitpy/port/apple.py:

(ApplePort.determine_full_port_name): Return valid port name for unnamed
versions.

• Scripts/webkitpy/port/base.py:

(Port.version_name): Check both public and internal version mapping
when returning a version name.

• Scripts/webkitpy/port/mac.py:

(MacPort.init): If no os version is defined, use the current version.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/apple.py (modified) (1 diff)
• Scripts/webkitpy/port/base.py (modified) (2 diffs)
• Scripts/webkitpy/port/mac.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-02-28  Jonathan Bedard  <jbedard@apple.com>
+
+        [webkitpy] Remove concept of 'future' versions (Follow-up fix 2)
+        https://bugs.webkit.org/show_bug.cgi?id=183184
+        <rdar://problem/37958594>
+
+        Reviewed by Aakash Jain.
+
+        Unlisted Apple versions can't run webkitpy tests because they don't
+        have specified port names.
+
+        * Scripts/webkitpy/port/apple.py:
+        (ApplePort.determine_full_port_name): Return valid port name for unnamed
+        versions.
+        * Scripts/webkitpy/port/base.py:
+        (Port.version_name): Check both public and internal version mapping
+        when returning a version name.
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.__init__): If no os version is defined, use the current version.
+
 2018-02-28  John Wilander  <wilander@apple.com>
 

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

@@ -61 +61 @@
             # being run, so this won't work if you're not on mac or win (respectively).
             # If you're not on the o/s in question, you must specify a full version or -future (cf. above).
-            if port_name == cls.port_name and not getattr(options, 'webkit_test_runner', False):
+            if port_name == cls.port_name and not getattr(options, 'webkit_test_runner', False) and host.platform.os_version_name():
                 port_name = cls.port_name + '-' + host.platform.os_version_name().lower().replace(' ', '')
+            elif host.platform.os_version_name():
+                port_name = cls.port_name + '-' + host.platform.os_version_name().lower().replace(' ', '') + '-wk2'
             else:
-                port_name = cls.port_name + '-' + host.platform.os_version_name().lower().replace(' ', '') + '-wk2'
+                port_name = cls.port_name + '-wk2'
         elif getattr(options, 'webkit_test_runner', False) and  '-wk2' not in port_name:
             port_name += '-wk2'

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

@@ -50 +50 @@
 from webkitpy.common.system import path
 from webkitpy.common.system.executive import ScriptError
-from webkitpy.common.version_name_map import PUBLIC_TABLE, VersionNameMap
+from webkitpy.common.version_name_map import PUBLIC_TABLE, INTERNAL_TABLE, VersionNameMap
 from webkitpy.common.wavediff import WaveDiff
 from webkitpy.common.webkit_finder import WebKitFinder
@@ -775 +775 @@
         if self._os_version is None:
             return None
-        return VersionNameMap.map(self.host.platform).to_name(self._os_version, table=PUBLIC_TABLE)
+        result = VersionNameMap.map(self.host.platform).to_name(self._os_version, table=PUBLIC_TABLE)
+        if not result:
+            result = VersionNameMap.map(self.host.platform).to_name(self._os_version, table=INTERNAL_TABLE)
+        return result
 
     def get_option(self, name, default_value=None):

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

@@ -57 +57 @@
         DarwinPort.__init__(self, host, port_name, **kwargs)
         version_name_map = VersionNameMap.map(host.platform)
+        self._os_version = None
         if port_name.split('-') > 1:
             self._os_version = version_name_map.from_name(port_name.split('-')[1])[1]
         elif self.host.platform.is_mac():
             self._os_version = self.host.platform.os_version
-        else:
+        if not self._os_version:
             self._os_version = MacPort.CURRENT_VERSION
-        assert self._os_version
         assert self._os_version.major == 10