Revert of Skip SkSharedMutexMultiThreaded test on TSAN bot while investigating. (patchset #1 id:1 of https://codereview.chromium.org/1213033003/)

Reason for revert:
Add tsan annotations to repair tests.

Original issue's description:
> Skip SkSharedMutexMultiThreaded test on TSAN bot while investigating.
>
> The ~ means "don't run this".  This keeps all the other bots running the code, skipping it only on the whiny TSAN bot.
>
> BUG=skia:3997
>
> Committed: https://skia.googlesource.com/skia/+/37cc0b2e31e4a078b12790253d7032d36271440c

TBR=mtklein@google.com,mtklein@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:3997

Review URL: https://codereview.chromium.org/1218153004
This commit is contained in:
herb 2015-06-30 14:23:29 -07:00 committed by Commit bot
parent dec1afcf34
commit 19fb80ed14
2 changed files with 3 additions and 5 deletions

View File

@ -946,8 +946,7 @@
"decode",
"Hopstarter-Mac-Folders-Apple.ico",
"--match",
"~Math",
"~SkSharedMutexMultiThreaded"
"~Math"
],
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind": [
"--matrix",

View File

@ -148,9 +148,8 @@ def get_args(bot):
match = []
if 'Valgrind' in bot: # skia:3021
match.append('~Threaded')
if 'TSAN' in bot:
match.append('~Math') # skia:3562
match.append('~SkSharedMutexMultiThreaded') # skia:3997
if 'TSAN' in bot: # skia:3562
match.append('~Math')
if 'GalaxyS3' in bot: # skia:1699
match.append('~WritePixels')