summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_lists/win/tests_fixable.txt14
1 files changed, 14 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
index 4438ea6..204f9f8 100644
--- a/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/win/tests_fixable.txt
@@ -1168,3 +1168,17 @@ LayoutTests/fast/css/computed-style.html = FAIL
LayoutTests/fast/repaint/change-transform.html = FAIL
LayoutTests/transitions/transition-drt-api-delay.html = TIMEOUT
LayoutTests/transitions/transition-shorthand-delay.html = TIMEOUT
+
+// MERGE 38653:38729: Expectations changed upstream
+LayoutTests/editing/execCommand/19653-4.html = FAIL
+LayoutTests/editing/deleting/5168598.html = FAIL
+LayoutTests/editing/deleting/delete-link-1.html = FAIL
+LayoutTests/editing/inserting/insert-before-link-1.html = FAIL
+LayoutTests/editing/execCommand/19089.html = FAIL
+LayoutTests/fast/block/positioning/047.html = FAIL
+LayoutTests/fast/text/cg-fallback-bolding.html = FAIL
+
+// MERGE 38653:38729: New tests
+LayoutTests/fast/repaint/outline-child-repaint.html = FAIL
+LayoutTests/http/tests/misc/single-character-pi-stylesheet.xhtml = FAIL
+LayoutTests/fast/workers/stress-js-execution.html = TIMEOUT