aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@chromium.org>2015-06-30 10:51:50 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-06-30 10:51:50 -0700
commit37cc0b2e31e4a078b12790253d7032d36271440c (patch)
tree0dbfb0c5f7167a99f1926b76d7469a479a2aede8 /tools
parent3691e669ae77fd3d0445d4cbe9f3308e5eb9fb85 (diff)
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 Review URL: https://codereview.chromium.org/1213033003
Diffstat (limited to 'tools')
-rw-r--r--tools/dm_flags.json3
-rwxr-xr-xtools/dm_flags.py5
2 files changed, 5 insertions, 3 deletions
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index aed4022590..fe0b60ed81 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -946,7 +946,8 @@
"decode",
"Hopstarter-Mac-Folders-Apple.ico",
"--match",
- "~Math"
+ "~Math",
+ "~SkSharedMutexMultiThreaded"
],
"Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Release-Valgrind": [
"--matrix",
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 524e1b6212..acf7892f48 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -148,8 +148,9 @@ def get_args(bot):
match = []
if 'Valgrind' in bot: # skia:3021
match.append('~Threaded')
- if 'TSAN' in bot: # skia:3562
- match.append('~Math')
+ if 'TSAN' in bot:
+ match.append('~Math') # skia:3562
+ match.append('~SkSharedMutexMultiThreaded') # skia:3997
if 'GalaxyS3' in bot: # skia:1699
match.append('~WritePixels')