diff options
| author | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-05 06:04:49 +0000 |
|---|---|---|
| committer | isherman@chromium.org <isherman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-02-05 06:04:49 +0000 |
| commit | d2e7870622454da3007518dbe4bac9e3081a13ac (patch) | |
| tree | d8c4c912988604c80ffd3cb7221aa3351aa249ae | |
| parent | 6b00cabd15cfff05f5f13bbcecba9b47c9bcdede (diff) | |
| download | chromium_src-d2e7870622454da3007518dbe4bac9e3081a13ac.zip chromium_src-d2e7870622454da3007518dbe4bac9e3081a13ac.tar.gz chromium_src-d2e7870622454da3007518dbe4bac9e3081a13ac.tar.bz2 | |
Re-disable IFrameTest.InEmptyFrame on Linux, re-enable on Mac/Win
BUG=70192
TEST=none
TBR= oshima@chromium.org
Review URL: http://codereview.chromium.org/6410108
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73922 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/iframe_uitest.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/iframe_uitest.cc b/chrome/browser/iframe_uitest.cc index c0740db..fca703b 100644 --- a/chrome/browser/iframe_uitest.cc +++ b/chrome/browser/iframe_uitest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -23,11 +23,11 @@ TEST_F(IFrameTest, Crash) { NavigateAndVerifyTitle("iframe.html", L"iframe test"); } -// Flakily crashes on non linux oses: http://crbug.com/70192 #if defined(OS_LINUX) -#define MAYBE_InEmptyFrame InEmptyFrame -#else +// Flakily crashes on linux: http://crbug.com/70192 #define MAYBE_InEmptyFrame DISABLED_InEmptyFrame +#else +#define MAYBE_InEmptyFrame InEmptyFrame #endif TEST_F(IFrameTest, MAYBE_InEmptyFrame) { NavigateAndVerifyTitle("iframe_in_empty_frame.html", L"iframe test"); |