Title: [174826] branches/safari-600.1-branch/LayoutTests
Diff
Modified: branches/safari-600.1-branch/LayoutTests/ChangeLog (174825 => 174826)
--- branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-10-17 17:41:27 UTC (rev 174825)
+++ branches/safari-600.1-branch/LayoutTests/ChangeLog 2014-10-17 18:28:57 UTC (rev 174826)
@@ -1,3 +1,18 @@
+2014-10-17 Dana Burkart <[email protected]>
+
+ Merge r171344
+
+ 2014-07-22 Alexey Proskuryakov <[email protected]>
+
+ media/track/track-in-band-subtitles-too-large.html and
+ media/track/track-long-word-container-sizing.html fail on Mac (dependent on other tests?)
+ https://bugs.webkit.org/show_bug.cgi?id=135160
+
+ Correcting test expectations - the failures are not WK1 only.
+
+ * platform/mac-wk1/TestExpectations:
+ * platform/mac/TestExpectations:
+
2014-10-16 Dana Burkart <[email protected]>
Merge r171301
Modified: branches/safari-600.1-branch/LayoutTests/platform/mac/TestExpectations (174825 => 174826)
--- branches/safari-600.1-branch/LayoutTests/platform/mac/TestExpectations 2014-10-17 17:41:27 UTC (rev 174825)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac/TestExpectations 2014-10-17 18:28:57 UTC (rev 174826)
@@ -1480,3 +1480,5 @@
fast/dom/call-a-constructor-as-a-function.html [ Failure ]
js/dom/constructor-length.html [ Failure ]
js/dom/global-constructors-attributes.html [ Failure ]
+webkit.org/b/135160 media/track/track-in-band-subtitles-too-large.html [ Pass Failure ]
+webkit.org/b/135160 media/track/track-long-word-container-sizing.html [ Pass Failure ]
Modified: branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations (174825 => 174826)
--- branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations 2014-10-17 17:41:27 UTC (rev 174825)
+++ branches/safari-600.1-branch/LayoutTests/platform/mac-wk1/TestExpectations 2014-10-17 18:28:57 UTC (rev 174826)
@@ -34,8 +34,6 @@
# Fails with WebKit1 only.
editing/secure-input/reset-state-on-navigation.html [ Failure ]
css3/blending/background-blend-mode-gif-color-2.html [ ImageOnlyFailure Pass ]
-media/track/track-in-band-subtitles-too-large.html [ Failure ]
-media/track/track-long-word-container-sizing.html [ Failure ]
# Plug-in blocking callback doesn't exist in WebKit1.
plugins/unavailable-plugin-indicator-obscurity.html
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes