diff options
| author | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 21:42:27 +0000 |
|---|---|---|
| committer | scheib@chromium.org <scheib@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-22 21:42:27 +0000 |
| commit | cd743991d5f580d194d424b0c23d9e379c757ca3 (patch) | |
| tree | 968181b83439b1779cac6d610785f5e04d7e6331 | |
| parent | d79e99e10ca1468c7a4ff97a5f3d793b41d87488 (diff) | |
| download | chromium_src-cd743991d5f580d194d424b0c23d9e379c757ca3.zip chromium_src-cd743991d5f580d194d424b0c23d9e379c757ca3.tar.gz chromium_src-cd743991d5f580d194d424b0c23d9e379c757ca3.tar.bz2 | |
Disable ApplyGradientMagnitudeOnFrame ExtractImageProfileInformationWithClosing
ApplyGradientMagnitudeOnFrame &
ExtractImageProfileInformationWithClosing
have been failing consistently on the chromium.webkit/console since Mac10.6 build 17587
http://build.chromium.org/p/chromium.webkit/builders/Mac10.6%20Tests/builds/17587
Chromium range: 194877:194894
Blink range: 148641:148645
The interesting thing is that Blink was rolled into the Chromium tree and is already at 148720, but not showing the error there.
The builder has been restarted, but the problem persists:
http://build.chromium.org/p/chromium.webkit/builders/Mac10.6%20Tests/builds/17657
TBR=motek@chromium.org
BUG=234336
Review URL: https://codereview.chromium.org/14081018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@195611 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/thumbnails/content_analysis_unittest.cc | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/chrome/browser/thumbnails/content_analysis_unittest.cc b/chrome/browser/thumbnails/content_analysis_unittest.cc index 6c695e4..3802cbc 100644 --- a/chrome/browser/thumbnails/content_analysis_unittest.cc +++ b/chrome/browser/thumbnails/content_analysis_unittest.cc @@ -115,7 +115,14 @@ TEST_F(ThumbnailContentAnalysisTest, ApplyGradientMagnitudeOnImpulse) { EXPECT_EQ(data_sum, all_sum); } -TEST_F(ThumbnailContentAnalysisTest, ApplyGradientMagnitudeOnFrame) { +// http://crbug.com/234336 +#if defined(OS_MACOSX) +#define MAYBE_ApplyGradientMagnitudeOnFrame \ + DISABLED_ApplyGradientMagnitudeOnFrame +#else +#define MAYBE_ApplyGradientMagnitudeOnFrame ApplyGradientMagnitudeOnFrame +#endif +TEST_F(ThumbnailContentAnalysisTest, MAYBE_ApplyGradientMagnitudeOnFrame) { gfx::Canvas canvas(gfx::Size(800, 600), ui::SCALE_FACTOR_100P, true); // The image consists of a single white block in the centre. @@ -217,8 +224,16 @@ TEST_F(ThumbnailContentAnalysisTest, ExtractImageProfileInformation) { std::accumulate(column_profile.begin(), column_profile.end(), 0)); } +// http://crbug.com/234336 +#if defined(OS_MACOSX) +#define MAYBE_ExtractImageProfileInformationWithClosing \ + DISABLED_ExtractImageProfileInformationWithClosing +#else +#define MAYBE_ExtractImageProfileInformationWithClosing \ + ExtractImageProfileInformationWithClosing +#endif TEST_F(ThumbnailContentAnalysisTest, - ExtractImageProfileInformationWithClosing) { + MAYBE_ExtractImageProfileInformationWithClosing) { gfx::Canvas canvas(gfx::Size(800, 600), ui::SCALE_FACTOR_100P, true); // The image consists of a two white frames drawn side by side, with a |