Title: [225738] trunk/Tools
Revision
225738
Author
[email protected]
Date
2017-12-10 23:55:10 -0800 (Sun, 10 Dec 2017)

Log Message

Unreviewed webkitpy fix on Linux platforms after r225721.

Add an empty 'linux' entry to the PUBLIC_TABLE mapping in the
VersionNameMap class. This avoids asserting in this class's
mapping_for_platform() method when the code is evaluated on a Linux
system, which happens when the static VERSION_FALLBACK_ORDER member in
the WinCairoPort class is constructed. This can occur during a
test-webkitpy run or when trying to construct a WPEPort instance in
PortFactory, which isn't possible because again the WinCairoPort
instance is constructed first, leading to the same assert in both cases.

* Scripts/webkitpy/common/version_name_map.py:
(VersionNameMap.__init__):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (225737 => 225738)


--- trunk/Tools/ChangeLog	2017-12-11 05:04:33 UTC (rev 225737)
+++ trunk/Tools/ChangeLog	2017-12-11 07:55:10 UTC (rev 225738)
@@ -1,3 +1,19 @@
+2017-12-10  Zan Dobersek  <[email protected]>
+
+        Unreviewed webkitpy fix on Linux platforms after r225721.
+
+        Add an empty 'linux' entry to the PUBLIC_TABLE mapping in the
+        VersionNameMap class. This avoids asserting in this class's
+        mapping_for_platform() method when the code is evaluated on a Linux
+        system, which happens when the static VERSION_FALLBACK_ORDER member in
+        the WinCairoPort class is constructed. This can occur during a
+        test-webkitpy run or when trying to construct a WPEPort instance in
+        PortFactory, which isn't possible because again the WinCairoPort
+        instance is constructed first, leading to the same assert in both cases.
+
+        * Scripts/webkitpy/common/version_name_map.py:
+        (VersionNameMap.__init__):
+
 2017-12-10  Youenn Fablet  <[email protected]>
 
         Add a script to automate W3c web-platform-tests pull request creations from WebKit commits

Modified: trunk/Tools/Scripts/webkitpy/common/version_name_map.py (225737 => 225738)


--- trunk/Tools/Scripts/webkitpy/common/version_name_map.py	2017-12-11 05:04:33 UTC (rev 225737)
+++ trunk/Tools/Scripts/webkitpy/common/version_name_map.py	2017-12-11 07:55:10 UTC (rev 225738)
@@ -66,6 +66,10 @@
                 'Vista': Version(6),
                 'XP': Version(5, 1),
             },
+
+            # This entry avoids hitting the assert in mapping_for_platform() on Linux,
+            # but otherwise shouldn't contain any useful key-value pairs.
+            'linux': {},
         }
 
     @classmethod
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to