Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(371)

Side by Side Diff: content/renderer/bmp_image_decoder_unittest.cc

Issue 23694017: Do not run BMPImageDecoderTest.DecodingSlow under TSan v2 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/test/image_decoder_test.h" 5 #include "content/test/image_decoder_test.h"
6 #include "third_party/WebKit/public/web/WebImageDecoder.h" 6 #include "third_party/WebKit/public/web/WebImageDecoder.h"
7 7
8 class BMPImageDecoderTest : public ImageDecoderTest { 8 class BMPImageDecoderTest : public ImageDecoderTest {
9 public: 9 public:
10 BMPImageDecoderTest() : ImageDecoderTest("bmp") { } 10 BMPImageDecoderTest() : ImageDecoderTest("bmp") { }
11 11
12 protected: 12 protected:
13 virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE { 13 virtual WebKit::WebImageDecoder* CreateWebKitImageDecoder() const OVERRIDE {
14 return new WebKit::WebImageDecoder(WebKit::WebImageDecoder::TypeBMP); 14 return new WebKit::WebImageDecoder(WebKit::WebImageDecoder::TypeBMP);
15 } 15 }
16 16
17 // The BMPImageDecoderTest tests are really slow under Valgrind. 17 // The BMPImageDecoderTest tests are really slow under Valgrind.
18 // Thus it is split into fast and slow versions. The threshold is 18 // Thus it is split into fast and slow versions. The threshold is
19 // set to 10KB because the fast test can finish under Valgrind in 19 // set to 10KB because the fast test can finish under Valgrind in
20 // less than 30 seconds. 20 // less than 30 seconds.
21 static const int64 kThresholdSize = 10240; 21 static const int64 kThresholdSize = 10240;
22 }; 22 };
23 23
24 TEST_F(BMPImageDecoderTest, DecodingFast) { 24 TEST_F(BMPImageDecoderTest, DecodingFast) {
25 TestDecoding(TEST_SMALLER, kThresholdSize); 25 TestDecoding(TEST_SMALLER, kThresholdSize);
26 } 26 }
27 27
28 #if defined(THREAD_SANITIZER)
29 // BMPImageDecoderTest.DecodingSlow als times out under ThreadSanitizer v2.
30 #define MAYBE_DecodingSlow DISABLED_DecodingSlow
31 #else
32 #define MAYBE_DecodingSlow DecodingSlow
33 #endif
28 TEST_F(BMPImageDecoderTest, DecodingSlow) { 34 TEST_F(BMPImageDecoderTest, DecodingSlow) {
29 TestDecoding(TEST_BIGGER, kThresholdSize); 35 TestDecoding(TEST_BIGGER, kThresholdSize);
30 } 36 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698