Add a mac-wk1 platform directory and TestExpectations file

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

Build fix. Put mac-wk1 between mac-mountainlion and mac.

* Scripts/webkitpy/port/mac.py:
(MacPort.default_baseline_search_path):
* Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
(TestRebaselineTest.test_baseline_directory):

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 8992a3161a3cf8294f04b170a590f07bd7391b7d..41e0a2ef27a3c8141b8f6854522550981ce50703 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2014-02-12  Ryosuke Niwa  <rniwa@webkit.org>
+
+        Add a mac-wk1 platform directory and TestExpectations file
+        https://bugs.webkit.org/show_bug.cgi?id=128676
+
+        Build fix. Put mac-wk1 between mac-mountainlion and mac.
+
+        * Scripts/webkitpy/port/mac.py:
+        (MacPort.default_baseline_search_path):
+        * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+        (TestRebaselineTest.test_baseline_directory):
+
 2014-02-12  Brady Eidson  <beidson@apple.com>
 
         Add a mac-wk1 platform directory and TestExpectations file

diff --git a/Tools/Scripts/webkitpy/port/mac.py b/Tools/Scripts/webkitpy/port/mac.py
index 929b079b1e1007d343bfed44f0ccb7c08fa3d4b2..e5ef793991d5e8977e9bcfa8e717bb1b89ab2e0e 100644 (file)
--- a/Tools/Scripts/webkitpy/port/mac.py
+++ b/Tools/Scripts/webkitpy/port/mac.py
@@ -78,14 +78,14 @@ class MacPort(ApplePort):
 
     def default_baseline_search_path(self):
         name = self._name.replace('-wk2', '')
+        wk_version = [] if self.get_option('webkit_test_runner') else ['mac-wk1']
         if name.endswith(self.FUTURE_VERSION):
-            fallback_names = [self.port_name]
+            fallback_names = wk_version + [self.port_name]
         else:
-            fallback_names = self.VERSION_FALLBACK_ORDER[self.VERSION_FALLBACK_ORDER.index(name):-1] + [self.port_name]
+            fallback_names = self.VERSION_FALLBACK_ORDER[self.VERSION_FALLBACK_ORDER.index(name):-1] + wk_version + [self.port_name]
+        # FIXME: mac-wk2 should appear at the same place as mac-wk1.
         if self.get_option('webkit_test_runner'):
             fallback_names = [self._wk2_port_name(), 'wk2'] + fallback_names
-        else:
-            fallback_names = ['mac-wk1'] + fallback_names
         return map(self._webkit_baseline_path, fallback_names)
 
     def _port_specific_expectations_files(self):

diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
index 87bae842f9779c5624724404c36e735603df4d22..432e64a45ce92d0f382dbc4b82f2c9c1f7240a70 100644 (file)
--- a/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py
@@ -89,7 +89,7 @@ class TestRebaselineTest(_BaseTestCase):
         self.assertMultiLineEqual(command._baseline_directory("Apple Lion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
         self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-mountainlion")
         self.assertMultiLineEqual(command._baseline_directory("Apple MountainLion Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
-        self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac")
+        self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk1")
         self.assertMultiLineEqual(command._baseline_directory("Apple Mavericks Release WK2 (Tests)"), "/mock-checkout/LayoutTests/platform/mac-wk2")
         self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Debug WK1"), "/mock-checkout/LayoutTests/platform/gtk-wk1")
         self.assertMultiLineEqual(command._baseline_directory("GTK Linux 64-bit Release WK1 (Tests)"), "/mock-checkout/LayoutTests/platform/gtk-wk1")