[iOS WK2] Add directory LayoutTests/platform/wk2 to the list of baseline search paths

https://bugs.webkit.org/show_bug.cgi?id=140942

Reviewed by Alexey Proskuryakov.

The directory LayoutTests/platform/wk2 contains test expectations and test results that
are applicable to all WebKit2 ports. We should make use of this information when
running layout tests using iOS WebKit2.

Additionally, make use of the convenience function Port._wk2_port_name() for the name
of the WebKit2 port instead of directly using string concatenation.

* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.default_baseline_search_path):

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index f850a4e..687c002 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,20 @@
+2015-01-27  Daniel Bates  <dabates@apple.com>
+
+        [iOS WK2] Add directory LayoutTests/platform/wk2 to the list of baseline search paths
+        https://bugs.webkit.org/show_bug.cgi?id=140942
+
+        Reviewed by Alexey Proskuryakov.
+
+        The directory LayoutTests/platform/wk2 contains test expectations and test results that
+        are applicable to all WebKit2 ports. We should make use of this information when
+        running layout tests using iOS WebKit2.
+
+        Additionally, make use of the convenience function Port._wk2_port_name() for the name
+        of the WebKit2 port instead of directly using string concatenation.
+
+        * Scripts/webkitpy/port/ios.py:
+        (IOSSimulatorPort.default_baseline_search_path):
+
 2015-01-27  Csaba Osztrogonác  <ossy@webkit.org>
 
         [Win] Disable FTL stress tests

diff --git a/Tools/Scripts/webkitpy/port/ios.py b/Tools/Scripts/webkitpy/port/ios.py
index eada406..56e2416 100644 (file)
--- a/Tools/Scripts/webkitpy/port/ios.py
+++ b/Tools/Scripts/webkitpy/port/ios.py
@@ -174,7 +174,7 @@ class IOSSimulatorPort(Port):
 
     def default_baseline_search_path(self):
         if self.get_option('webkit_test_runner'):
-            fallback_names = [self.port_name + '-wk2'] + [self.port_name]
+            fallback_names = [self._wk2_port_name(), 'wk2'] + [self.port_name]
         else:
             fallback_names = [self.port_name + '-wk1'] + [self.port_name]