webkitpy: add comment about how determine_full_port_name() works for apple ports...

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):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@121596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 750c75c..5dd053b 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,5 +1,18 @@
 2012-06-29  Dirk Pranke  <dpranke@chromium.org>
 
+        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  <dpranke@chromium.org>
+
         webkitpy: remove support for mac leopard from chromium configurations
         https://bugs.webkit.org/show_bug.cgi?id=90313
 

diff --git a/Tools/Scripts/webkitpy/layout_tests/port/apple.py b/Tools/Scripts/webkitpy/layout_tests/port/apple.py
index 8807d40..5e8b8b8 100644 (file)
--- a/Tools/Scripts/webkitpy/layout_tests/port/apple.py
+++ b/Tools/Scripts/webkitpy/layout_tests/port/apple.py
@@ -51,11 +51,16 @@ class ApplePort(WebKitPort):
 
     @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