diff options
| author | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 23:00:25 +0000 |
|---|---|---|
| committer | atwilson@chromium.org <atwilson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-13 23:00:25 +0000 |
| commit | 37a1768838a2a4bcec2cafbf05f3c026938beb9a (patch) | |
| tree | 0cb15cb4de5fb2007926a29cc10bd41eb54fb356 /chrome/browser/browser_encoding_uitest.cc | |
| parent | 9c4f89e51bbf837e28623053e03215eb4622c0f8 (diff) | |
| download | chromium_src-37a1768838a2a4bcec2cafbf05f3c026938beb9a.zip chromium_src-37a1768838a2a4bcec2cafbf05f3c026938beb9a.tar.gz chromium_src-37a1768838a2a4bcec2cafbf05f3c026938beb9a.tar.bz2 | |
Mark TestEncodingAliasMapping flaky on mac.
BUG=82616
TEST=Watch test go green on mac build bots.
TBR=jnd
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_encoding_uitest.cc | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc index 43a49ca..f2a24f0 100644 --- a/chrome/browser/browser_encoding_uitest.cc +++ b/chrome/browser/browser_encoding_uitest.cc @@ -52,6 +52,10 @@ class BrowserEncodingTest : public UITest { // 2. Add more files with multiple encoding name variants for each canonical // encoding name). Webkit layout tests cover some, but testing in the UI test is // also necessary. + +#if defined(OS_MACOSX) +#define TestEncodingAliasMapping FLAKY_TestEncodingAliasMapping +#endif TEST_F(BrowserEncodingTest, TestEncodingAliasMapping) { struct EncodingTestData { const char* file_name; |