summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 19:10:14 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-13 19:10:14 +0000
commiteca36599cd458c3d09acb97c66c901ca55438698 (patch)
tree8787dcfb31b3bbc17d940608d2ce60888895d818
parent1085e7fa76ad5da048912aa6d111a60eff9b5d2f (diff)
downloadchromium_src-eca36599cd458c3d09acb97c66c901ca55438698.zip
chromium_src-eca36599cd458c3d09acb97c66c901ca55438698.tar.gz
chromium_src-eca36599cd458c3d09acb97c66c901ca55438698.tar.bz2
Temporarily disabling http/tests/loading/basic.html & http/tests/misc/slow-preload-cancel.html in win.
Will be fixed in the next webkit roll. TBR: oshima git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52202 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
2 files changed, 5 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index f6120c3..3061079 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
vars = {
"webkit_trunk":
"http://svn.webkit.org/repository/webkit/trunk",
- "webkit_revision": "63173",
+ "webkit_revision": "63220",
"ffmpeg_revision": "49485",
"skia_revision": "583",
"chromium_git": "http://src.chromium.org/git",
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index aa81e23..84c505b 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -89,3 +89,7 @@ BUGAWONG WIN : http/tests/plugins/plugin-document-has-focus.html = TEXT
BUGAWONG MAC : media/video-volume-slider.html = IMAGE+TEXT
BUG48668 MAC : svg/W3C-SVG-1.1/struct-use-01-t.svg = FAIL
+
+// Crashes in dbg win. Will be fixed in next webkit roll.
+BUGAWONG WIN : http/tests/loading/basic.html = CRASH PASS
+BUGAWONG WIN : http/tests/misc/slow-preload-cancel.html = CRASH PASS