Diff
Modified: trunk/LayoutTests/ChangeLog (134276 => 134277)
--- trunk/LayoutTests/ChangeLog 2012-11-12 19:54:45 UTC (rev 134276)
+++ trunk/LayoutTests/ChangeLog 2012-11-12 20:08:27 UTC (rev 134277)
@@ -1,3 +1,16 @@
+2012-11-12 Dirk Pranke <[email protected]>
+
+ remove the chromium-mac-mountainlion TestExpectations file
+ https://bugs.webkit.org/show_bug.cgi?id=101789
+
+ Reviewed by Ojan Vafai.
+
+ Nearly all of the tests have been updated for 10.8 and the remaining
+ failures have been merged into the main TestExpectations file. We
+ don't need this hook any more.
+
+ * platform/chromium-mac-mountainlion/TestExpectations: Removed.
+
2012-11-12 Arpita Bahuguna <[email protected]>
Specified width CSS tables should not include border and padding as part of that width.
Deleted: trunk/LayoutTests/platform/chromium-mac-mountainlion/TestExpectations (134276 => 134277)
--- trunk/LayoutTests/platform/chromium-mac-mountainlion/TestExpectations 2012-11-12 19:54:45 UTC (rev 134276)
+++ trunk/LayoutTests/platform/chromium-mac-mountainlion/TestExpectations 2012-11-12 20:08:27 UTC (rev 134277)
@@ -1,7 +0,0 @@
-# NOTE: This file is temporary and should only be modified by
-# [email protected] or others working on getting the Chromium port
-# passing cleanly on Mountain Lion.
-#
-# All normal test suppressions should go in LayoutTests/platform/chromium/TestExpectations instead
-#
-
Modified: trunk/Tools/ChangeLog (134276 => 134277)
--- trunk/Tools/ChangeLog 2012-11-12 19:54:45 UTC (rev 134276)
+++ trunk/Tools/ChangeLog 2012-11-12 20:08:27 UTC (rev 134277)
@@ -1,3 +1,19 @@
+2012-11-12 Dirk Pranke <[email protected]>
+
+ remove the chromium-mac-mountainlion TestExpectations file
+ https://bugs.webkit.org/show_bug.cgi?id=101789
+
+ Reviewed by Ojan Vafai.
+
+ Nearly all of the tests have been updated for 10.8 and the remaining
+ failures have been merged into the main TestExpectations file. We
+ don't need this hook any more.
+
+ * Scripts/webkitpy/layout_tests/port/chromium_mac.py:
+ (ChromiumMacPort.operating_system):
+ * Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py:
+ (ChromiumMacPortTest.test_path_to_image_diff):
+
2012-11-12 Peter Beverloo <[email protected]>
[Chromium-Android] Restart the device's shell in root before pushing data
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py (134276 => 134277)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2012-11-12 19:54:45 UTC (rev 134276)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/builders.py 2012-11-12 20:08:27 UTC (rev 134277)
@@ -58,8 +58,7 @@
"WebKit Mac10.6 (dbg)": {"port_name": "chromium-mac-snowleopard", "specifiers": set(["snowleopard", "debug"])},
"WebKit Mac10.7": {"port_name": "chromium-mac-lion", "specifiers": set(["lion", "release"])},
"WebKit Mac10.7 (dbg)": {"port_name": "chromium-mac-lion", "specifiers": set(["lion", "debug"])},
- "WebKit Mac10.8": {"port_name": "chromium-mac-mountainlion", "specifiers": set(["mountainlion", "release"]),
- "move_overwritten_baselines_to": ["chromium-mac-lion"]},
+ "WebKit Mac10.8": {"port_name": "chromium-mac-mountainlion", "specifiers": set(["mountainlion", "release"])},
# These builders are on build.webkit.org.
"Apple MountainLion Release WK1 (Tests)": {"port_name": "mac-mountainlion", "specifiers": set(["mountainlion"]), "rebaseline_override_dir": "mac"},
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py (134276 => 134277)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2012-11-12 19:54:45 UTC (rev 134276)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac.py 2012-11-12 20:08:27 UTC (rev 134277)
@@ -92,14 +92,6 @@
def operating_system(self):
return 'mac'
- def expectations_files(self):
- # FIXME: This is a temporary hack while getting the 10.8 baselines up to date.
- # See https://bugs.webkit.org/show_bug.cgi?id=99505
- files = super(ChromiumMacPort, self).expectations_files()
- if self.name() == 'chromium-mac-mountainlion':
- files.append(self._filesystem.join(self._webkit_baseline_path(self.name()), 'TestExpectations'))
- return files
-
#
# PROTECTED METHODS
#
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py (134276 => 134277)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2012-11-12 19:54:45 UTC (rev 134276)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium_mac_unittest.py 2012-11-12 20:08:27 UTC (rev 134277)
@@ -102,9 +102,6 @@
def test_path_to_image_diff(self):
self.assertEquals(self.make_port()._path_to_image_diff(), '/mock-checkout/out/Release/ImageDiff')
- def test_ml_expectations(self):
- self.assertTrue(self.make_port(port_name='chromium-mac-mountainlion').expectations_files()[-1].endswith('-mountainlion/TestExpectations'))
- self.assertFalse(self.make_port(port_name='chromium-mac-lion').expectations_files()[-1].endswith('-mountainlion/TestExpectations'))
if __name__ == '__main__':
port_testcase.main()
