diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 12:00:26 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-06 12:00:26 +0000 |
| commit | 70bd4e54305d5fc2c7466f0c4edcc4f4bd56b574 (patch) | |
| tree | 12b64a0574d5cf8969a3dd6c410ec9f981f5a1e9 /content/renderer/bmp_image_decoder_unittest.cc | |
| parent | 0bf879a2e27176c7c53c1216aa5062c0354e5ba8 (diff) | |
| download | chromium_src-70bd4e54305d5fc2c7466f0c4edcc4f4bd56b574.zip chromium_src-70bd4e54305d5fc2c7466f0c4edcc4f4bd56b574.tar.gz chromium_src-70bd4e54305d5fc2c7466f0c4edcc4f4bd56b574.tar.bz2 | |
Do not run BMPImageDecoderTest.DecodingSlow under TSan v2
TBR=jamesr@chromium.org
Review URL: https://codereview.chromium.org/23694017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221687 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/bmp_image_decoder_unittest.cc')
| -rw-r--r-- | content/renderer/bmp_image_decoder_unittest.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/content/renderer/bmp_image_decoder_unittest.cc b/content/renderer/bmp_image_decoder_unittest.cc index 4b6ddf58..0402ac8 100644 --- a/content/renderer/bmp_image_decoder_unittest.cc +++ b/content/renderer/bmp_image_decoder_unittest.cc @@ -25,6 +25,12 @@ TEST_F(BMPImageDecoderTest, DecodingFast) { TestDecoding(TEST_SMALLER, kThresholdSize); } +#if defined(THREAD_SANITIZER) +// BMPImageDecoderTest.DecodingSlow als times out under ThreadSanitizer v2. +#define MAYBE_DecodingSlow DISABLED_DecodingSlow +#else +#define MAYBE_DecodingSlow DecodingSlow +#endif TEST_F(BMPImageDecoderTest, DecodingSlow) { TestDecoding(TEST_BIGGER, kThresholdSize); } |