summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 20:57:47 +0000
committermsw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-12 20:57:47 +0000
commita0bdd4b49c8ece45f119f3765d77db3fffd2d9be (patch)
tree15a3df7dc8500f3725923cc236354315b6a9ccd5
parent004d7d40958b08b2e26293f3a9adcf3b6687dc45 (diff)
downloadchromium_src-a0bdd4b49c8ece45f119f3765d77db3fffd2d9be.zip
chromium_src-a0bdd4b49c8ece45f119f3765d77db3fffd2d9be.tar.gz
chromium_src-a0bdd4b49c8ece45f119f3765d77db3fffd2d9be.tar.bz2
Mark IFrameTest.InEmptyFrame FAILS_ on OS_CHROMEOS.
BUG=100101 TEST=Failures expected on ChromeOS. TBR=oshima Review URL: http://codereview.chromium.org/8248004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105155 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/iframe_uitest.cc8
1 files changed, 7 insertions, 1 deletions
diff --git a/chrome/browser/iframe_uitest.cc b/chrome/browser/iframe_uitest.cc
index bc69358..ecbb5f6 100644
--- a/chrome/browser/iframe_uitest.cc
+++ b/chrome/browser/iframe_uitest.cc
@@ -23,6 +23,12 @@ TEST_F(IFrameTest, Crash) {
NavigateAndVerifyTitle("iframe.html", L"iframe test");
}
-TEST_F(IFrameTest, InEmptyFrame) {
+// Fails consistently on Linux ChromeOS: http://crbug.com/100101
+#if defined(OS_CHROMEOS)
+#define MAYBE_InEmptyFrame FAILS_InEmptyFrame
+#else
+#define MAYBE_InEmptyFrame InEmptyFrame
+#endif
+TEST_F(IFrameTest, MAYBE_InEmptyFrame) {
NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test");
}