Title: [201950] branches/safari-601-branch/LayoutTests
- Revision
- 201950
- Author
- matthew_han...@apple.com
- Date
- 2016-06-10 16:10:52 -0700 (Fri, 10 Jun 2016)
Log Message
Merge r201287. rdar://problem/26228555
Modified Paths
Diff
Modified: branches/safari-601-branch/LayoutTests/ChangeLog (201949 => 201950)
--- branches/safari-601-branch/LayoutTests/ChangeLog 2016-06-10 23:05:52 UTC (rev 201949)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2016-06-10 23:10:52 UTC (rev 201950)
@@ -1,3 +1,16 @@
+2016-06-10 Matthew Hanson <matthew_han...@apple.com>
+
+ Merge r201287. rdar://problem/26228555
+
+ 2016-05-23 Ryan Haddad <ryanhad...@apple.com>
+
+ Marking fast/frames/crash-during-iframe-load-stop.html as a flaky timeout
+ https://bugs.webkit.org/show_bug.cgi?id=157849
+
+ Unreviewed test gardening.
+
+ * TestExpectations:
+
2016-05-16 Babak Shafiei <bshaf...@apple.com>
Merge r200986.
Modified: branches/safari-601-branch/LayoutTests/TestExpectations (201949 => 201950)
--- branches/safari-601-branch/LayoutTests/TestExpectations 2016-06-10 23:05:52 UTC (rev 201949)
+++ branches/safari-601-branch/LayoutTests/TestExpectations 2016-06-10 23:10:52 UTC (rev 201950)
@@ -581,3 +581,4 @@
inspector/model/parse-script-syntax-tree.html [Skip]
webkit.org/b/147229 inspector/css/modify-rule-selector.html [ Skip ]
+webkit.org/b/157849 fast/frames/crash-during-iframe-load-stop.html [ Pass Timeout ]
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
