diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-12 21:01:58 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-12 21:01:58 +0000 |
| commit | dba25108786dd82e4babf983a581307b4bc8108a (patch) | |
| tree | 131c34a2a962ee22e04ee6d736b40307941a00b1 /chrome/browser/sanity_uitest.cc | |
| parent | 2de7c6b08bcc47b7dcb98e8a7c229eb47decd7c4 (diff) | |
| download | chromium_src-dba25108786dd82e4babf983a581307b4bc8108a.zip chromium_src-dba25108786dd82e4babf983a581307b4bc8108a.tar.gz chromium_src-dba25108786dd82e4babf983a581307b4bc8108a.tar.bz2 | |
Valgrind: Mark GoogleTest.Crash and ColumnLayout.Crash as flaky under Mac.
BUT=85863
TEST=none
TBR=thestig
BUG=
Review URL: http://codereview.chromium.org/7003136
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@88793 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sanity_uitest.cc')
| -rw-r--r-- | chrome/browser/sanity_uitest.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chrome/browser/sanity_uitest.cc b/chrome/browser/sanity_uitest.cc index cd02db2..19e9a9c 100644 --- a/chrome/browser/sanity_uitest.cc +++ b/chrome/browser/sanity_uitest.cc @@ -21,7 +21,13 @@ class GoogleTest : public UITest { } }; -TEST_F(GoogleTest, Crash) { +// Flakily fails under Valgrind, see http://crbug.com/85863. +#if defined(OS_MACOSX) +#define MAYBE_Crash FLAKY_Crash +#else +#define MAYBE_Crash Crash +#endif // defined(OS_MACOSX) +TEST_F(GoogleTest, MAYBE_Crash) { std::wstring page_title = L"Google"; // Make sure the navigation succeeded. @@ -38,7 +44,8 @@ class ColumnLayout : public UITest { } }; -TEST_F(ColumnLayout, Crash) { +// Flakily fails under Valgrind, see http://crbug.com/85863. +TEST_F(ColumnLayout, MAYBE_Crash) { std::wstring page_title = L"Column test"; // Make sure the navigation succeeded. |