summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--webkit/tools/layout_tests/test_lists/tests_fixable.txt21
1 files changed, 7 insertions, 14 deletions
diff --git a/webkit/tools/layout_tests/test_lists/tests_fixable.txt b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
index a67bfe9..80e34a0 100644
--- a/webkit/tools/layout_tests/test_lists/tests_fixable.txt
+++ b/webkit/tools/layout_tests/test_lists/tests_fixable.txt
@@ -1899,21 +1899,14 @@ LayoutTests/plugins/npruntime.html = TIMEOUT
LayoutTests/editing/selection/5057506.html = FAIL
LINUX WIN : LayoutTests/fast/events/init-events.html = FAIL
+// Merge 39880:39894 - new tests
+LayoutTests/http/tests/security/dataTransfer-set-data-file-url.html = FAIL
+LayoutTests/platform/mac/editing/pasteboard/dataTransfer-set-data-file-url.html = FAIL
+
// Merge 39880:39894 - regressions
-LayoutTests/animations/change-keyframes-name.html = FAIL
-LayoutTests/editing/execCommand/paste-1.html = FAIL
-// Note: this failed before the merge on Windows, just not crashed.
-WIN : LayoutTests/fast/borders/border-image-omit-right-slice.html = CRASH
-WIN : LayoutTests/fast/css/css2-system-fonts.html = FAIL
-LayoutTests/fast/dom/anchor-toString.html = FAIL
-WIN : LayoutTests/fast/dom/object-embed-plugin-scripting.html = FAIL
+// Note: this failed before the merge on Windows, just not crashed (brettw saw
+// this on his machine once so is marking it as so).
+WIN : LayoutTests/fast/borders/border-image-omit-right-slice.html = FAIL | CRASH
LayoutTests/fast/js/numeric-conversion.html = FAIL
-WIN : LayoutTests/fast/lists/001.html = FAIL
-LayoutTests/fast/text/basic/006.html = FAIL
-WIN : LayoutTests/fast/text/international/complex-character-based-fallback.html = FAIL
-WIN : LayoutTests/fast/text/line-breaks.html = FAIL
-LayoutTests/fast/text/text-shadow-extreme-value.html = FAIL
-LayoutTests/fast/text/whitespace/026.html = FAIL
LayoutTests/http/tests/security/dataTransfer-set-data-file-url.html = FAIL
-WIN : LayoutTests/plugins/embed-attributes-setting.html = FAIL