diff options
| author | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 12:41:09 +0000 |
|---|---|---|
| committer | glider@chromium.org <glider@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-07 12:41:09 +0000 |
| commit | 0630229f2d7a79367eda1e27798e3831a454d0b1 (patch) | |
| tree | 30140a77bb1d9f079d6f2f7e93f5568c8cc62697 /skia/ext/convolver_unittest.cc | |
| parent | 0d6296abbb5e712fc0c29dba635c304ca2582e36 (diff) | |
| download | chromium_src-0630229f2d7a79367eda1e27798e3831a454d0b1.zip chromium_src-0630229f2d7a79367eda1e27798e3831a454d0b1.tar.gz chromium_src-0630229f2d7a79367eda1e27798e3831a454d0b1.tar.bz2 | |
Disable Convolver.SIMDVerification under the ThreadSanitizer.
BUG=134400
TBR=jiesun@chromium.org
Review URL: https://codereview.chromium.org/22579002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@216165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia/ext/convolver_unittest.cc')
| -rw-r--r-- | skia/ext/convolver_unittest.cc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/skia/ext/convolver_unittest.cc b/skia/ext/convolver_unittest.cc index f99bf78..8d0c852 100644 --- a/skia/ext/convolver_unittest.cc +++ b/skia/ext/convolver_unittest.cc @@ -212,7 +212,13 @@ TEST(Convolver, AddFilter) { ASSERT_EQ(0, filter_length); } -TEST(Convolver, SIMDVerification) { +#if defined(THREAD_SANITIZER) +// Times out under ThreadSanitizer, http://crbug.com/134400. +#define MAYBE_SIMDVerification DISABLED_SIMDVerification +#else +#define MAYBE_SIMDVerification SIMDVerification +#endif +TEST(Convolver, MAYBE_SIMDVerification) { int source_sizes[][2] = { {1,1}, {1,2}, {1,3}, {1,4}, {1,5}, {2,1}, {2,2}, {2,3}, {2,4}, {2,5}, |