Title: [121596] trunk/Tools
- Revision
- 121596
- Author
- [email protected]
- Date
- 2012-06-29 15:25:24 -0700 (Fri, 29 Jun 2012)
Log Message
webkitpy: add comment about how determine_full_port_name() works for apple ports, fix -wk2 bug
https://bugs.webkit.org/show_bug.cgi?id=90314
Reviewed by Ojan Vafai.
Add comments and fix a bug in how we would handle the mac-wk2
and win-wk2 port names after confusion around in bug 90312 :).
* Scripts/webkitpy/layout_tests/port/apple.py:
(ApplePort.determine_full_port_name):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (121595 => 121596)
--- trunk/Tools/ChangeLog 2012-06-29 22:16:56 UTC (rev 121595)
+++ trunk/Tools/ChangeLog 2012-06-29 22:25:24 UTC (rev 121596)
@@ -1,5 +1,18 @@
2012-06-29 Dirk Pranke <[email protected]>
+ webkitpy: add comment about how determine_full_port_name() works for apple ports, fix -wk2 bug
+ https://bugs.webkit.org/show_bug.cgi?id=90314
+
+ Reviewed by Ojan Vafai.
+
+ Add comments and fix a bug in how we would handle the mac-wk2
+ and win-wk2 port names after confusion around in bug 90312 :).
+
+ * Scripts/webkitpy/layout_tests/port/apple.py:
+ (ApplePort.determine_full_port_name):
+
+2012-06-29 Dirk Pranke <[email protected]>
+
webkitpy: remove support for mac leopard from chromium configurations
https://bugs.webkit.org/show_bug.cgi?id=90313
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py (121595 => 121596)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py 2012-06-29 22:16:56 UTC (rev 121595)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/apple.py 2012-06-29 22:25:24 UTC (rev 121596)
@@ -51,11 +51,16 @@
@classmethod
def determine_full_port_name(cls, host, options, port_name):
+ # If the port_name matches the (badly named) cls.port_name, that
+ # means that they passed 'mac' or 'win' and didn't specify a version.
+ # That convention means that we're supposed to use the version currently
+ # 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:
assert port_name == host.platform.os_name
return cls.port_name + '-' + host.platform.os_version
if port_name == cls.port_name + '-wk2':
- assert port_name == host.platform.os_name
+ assert port_name == host.platform.os_name + '-wk2'
return cls.port_name + '-' + host.platform.os_version + '-wk2'
return port_name
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
