diff options
author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:37:48 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-07-30 11:38:52 +0200 |
commit | 89e2486a48b739f8d771d69ede5a6a1b244a10fc (patch) | |
tree | 503b1a7812cf97d93704c32437eb5f62dc1a1ff9 /Source/WebKit/chromium/tests/WebViewTest.cpp | |
parent | 625f028249cb37c55bbbd153f3902afd0b0756d9 (diff) | |
download | qtwebkit-89e2486a48b739f8d771d69ede5a6a1b244a10fc.tar.gz |
Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)
New snapshot with prospective Mountain Lion build fix
Diffstat (limited to 'Source/WebKit/chromium/tests/WebViewTest.cpp')
-rw-r--r-- | Source/WebKit/chromium/tests/WebViewTest.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Source/WebKit/chromium/tests/WebViewTest.cpp b/Source/WebKit/chromium/tests/WebViewTest.cpp index 33ce2f70c..3ca1094d0 100644 --- a/Source/WebKit/chromium/tests/WebViewTest.cpp +++ b/Source/WebKit/chromium/tests/WebViewTest.cpp @@ -254,7 +254,9 @@ TEST_F(WebViewTest, AutoResizeFixedHeightAndWidthOverflow) expectedWidth, expectedHeight, VisibleHorizontalScrollbar, NoVerticalScrollbar); } -TEST_F(WebViewTest, AutoResizeInBetweenSizes) +// Next three tests disabled for https://bugs.webkit.org/show_bug.cgi?id=92318 . +// It seems we can run three AutoResize tests, then the next one breaks. +TEST_F(WebViewTest, DISABLED_AutoResizeInBetweenSizes) { WebSize minAutoResize(90, 95); WebSize maxAutoResize(200, 300); @@ -266,7 +268,7 @@ TEST_F(WebViewTest, AutoResizeInBetweenSizes) expectedWidth, expectedHeight, NoHorizontalScrollbar, NoVerticalScrollbar); } -TEST_F(WebViewTest, AutoResizeOverflowSizes) +TEST_F(WebViewTest, DISABLED_AutoResizeOverflowSizes) { WebSize minAutoResize(90, 95); WebSize maxAutoResize(200, 300); @@ -278,7 +280,7 @@ TEST_F(WebViewTest, AutoResizeOverflowSizes) expectedWidth, expectedHeight, VisibleHorizontalScrollbar, VisibleVerticalScrollbar); } -TEST_F(WebViewTest, AutoResizeMaxSize) +TEST_F(WebViewTest, DISABLED_AutoResizeMaxSize) { WebSize minAutoResize(90, 95); WebSize maxAutoResize(200, 300); |