summaryrefslogtreecommitdiffstats
path: root/webkit/tools
diff options
context:
space:
mode:
authorhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-08 18:35:49 +0000
committerhclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-08 18:35:49 +0000
commit4898e3f847656330825d264e8529a6568446ac0f (patch)
tree2f3bc93f44e65b9d2e111134c9983404fda57678 /webkit/tools
parentb10c1c8dedb23a41b5e4ff8d6b5e4718a218a767 (diff)
downloadchromium_src-4898e3f847656330825d264e8529a6568446ac0f.zip
chromium_src-4898e3f847656330825d264e8529a6568446ac0f.tar.gz
chromium_src-4898e3f847656330825d264e8529a6568446ac0f.tar.bz2
Update test_expectations.txt after webkit merge
TBR=nsylvian BUG=13901 Review URL: http://codereview.chromium.org/155229 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20177 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index cf6e5a9..72a4ce5 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -656,6 +656,8 @@ BUG13907 WIN : LayoutTests/media/video-src-remove.html = FAIL
// These tests are flaky.
BUG13097 WIN : LayoutTests/media/video-display-toggle.html = FAIL
BUG13907 WIN : LayoutTests/media/controls-styling.html = FAIL
+// This test is added in WebKit merge 45610:45621
+BUG13907 WIN : LayoutTests/media/controls-after-reload.html = TIMEOUT
// Function arguments object is copied for each access.
BUG941049 : LayoutTests/fast/js/kde/function_arguments.html = FAIL