diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 07:58:29 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-20 07:58:29 +0000 |
| commit | dbb0203e9279757eeb90084ad7f443dce69e74aa (patch) | |
| tree | 3ddec5426a67969326f556c9b88f1a5c70f2828b /chrome/browser/browser_encoding_uitest.cc | |
| parent | 48e0113d7d003b81f1168e1cbc7d230e382bd735 (diff) | |
| download | chromium_src-dbb0203e9279757eeb90084ad7f443dce69e74aa.zip chromium_src-dbb0203e9279757eeb90084ad7f443dce69e74aa.tar.gz chromium_src-dbb0203e9279757eeb90084ad7f443dce69e74aa.tar.bz2 | |
Disable BrowserEncodingTest.TestEncodingAutoDetect on CrOS. It's almost always failing and takes way too long to timeout.
BUG=44666
TEST=Faster cycle times.
Review URL: http://codereview.chromium.org/3943001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63188 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_encoding_uitest.cc')
| -rw-r--r-- | chrome/browser/browser_encoding_uitest.cc | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/chrome/browser/browser_encoding_uitest.cc b/chrome/browser/browser_encoding_uitest.cc index 1b52a3d..8775938 100644 --- a/chrome/browser/browser_encoding_uitest.cc +++ b/chrome/browser/browser_encoding_uitest.cc @@ -169,8 +169,14 @@ TEST_F(BrowserEncodingTest, FLAKY_TestOverrideEncoding) { // For Hebrew, the expected encoding value is ISO-8859-8-I. See // http://crbug.com/2927 for more details. -// FLAKY: see http://crbug.com/44666 -TEST_F(BrowserEncodingTest, FLAKY_TestEncodingAutoDetect) { +// FLAKY / Disabled on CrOS: see http://crbug.com/44666 +#if defined(OS_CHROMEOS) +#define MAYBE_TestEncodingAutoDetect DISABLED_TestEncodingAutoDetect +#else +#define MAYBE_TestEncodingAutoDetect FLAKY_TestEncodingAutoDetect +#endif + +TEST_F(BrowserEncodingTest, MAYBE_TestEncodingAutoDetect) { struct EncodingAutoDetectTestData { const char* test_file_name; // File name of test data. const char* expected_result; // File name of expected results. |