Title: [163979] trunk/Tools
- Revision
- 163979
- Author
- [email protected]
- Date
- 2014-02-12 13:27:22 -0800 (Wed, 12 Feb 2014)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (163978 => 163979)
--- trunk/Tools/ChangeLog 2014-02-12 21:22:30 UTC (rev 163978)
+++ trunk/Tools/ChangeLog 2014-02-12 21:27:22 UTC (rev 163979)
@@ -1,3 +1,15 @@
+2014-02-12 Ryosuke Niwa <[email protected]>
+
+ 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 <[email protected]>
Add a mac-wk1 platform directory and TestExpectations file
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (163978 => 163979)
--- trunk/Tools/Scripts/webkitpy/port/mac.py 2014-02-12 21:22:30 UTC (rev 163978)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2014-02-12 21:27:22 UTC (rev 163979)
@@ -78,14 +78,14 @@
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):
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (163978 => 163979)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-02-12 21:22:30 UTC (rev 163978)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2014-02-12 21:27:22 UTC (rev 163979)
@@ -89,7 +89,7 @@
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")
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
