diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 22:18:13 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-25 22:18:13 +0000 |
| commit | c82eaa5262da607ff04069cefcf67df4cf5bbcb1 (patch) | |
| tree | 73c087115c2aace336505fd931dca1a6043ebdf7 /chrome/browser/browser_encoding_uitest.cc | |
| parent | 3b1ea24972af975f96f7bdf6040fbc5048ea8b6d (diff) | |
| download | chromium_src-c82eaa5262da607ff04069cefcf67df4cf5bbcb1.zip chromium_src-c82eaa5262da607ff04069cefcf67df4cf5bbcb1.tar.gz chromium_src-c82eaa5262da607ff04069cefcf67df4cf5bbcb1.tar.bz2 | |
Flaky tests on linux/view/64bit builds.
Also updated browser_tests to use #define instead of #if/else, like other tests.
BUG=28808
TEST=None
Review URL: http://codereview.chromium.org/442012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33137 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_encoding_uitest.cc | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc index 8d68314..18c3279 100644 --- a/chrome/browser/browser_encoding_uitest.cc +++ b/chrome/browser/browser_encoding_uitest.cc @@ -47,6 +47,13 @@ class BrowserEncodingTest : public UITest { FilePath temp_sub_resource_dir_; }; +#if defined(OS_CHROMEOS) +// These tests are flaky on linux/views builds. +// See http://crbug.com/28808. +#define TestEncodingAliasMapping FLAKY_TestEncodingAliasMapping +#define TestEncodingAutoDetect FLAKY_TestEncodingAutoDetect +#endif + // TODO(jnd): 1. Some encodings are missing here. It'll be added later. See // http://crbug.com/13306. // 2. Add more files with multiple encoding name variants for each canonical |