aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar bsalomon <bsalomon@google.com>2015-10-30 09:05:32 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-10-30 09:05:32 -0700
commitf93982a4775763fbc754c5feb96f11ef65612f46 (patch)
tree78cabd6ee611dfeb670c55be32cd93c0d1036864 /tools
parent21adcb9fa0abe67041095c07f8760a14b0fb40c0 (diff)
Don't run nvpr on TSAN bot
Diffstat (limited to 'tools')
-rwxr-xr-xtools/dm_flags.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index 1e8312d289..d62f764f94 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -39,11 +39,15 @@ def get_args(bot):
configs.append('sp-8888')
configs.extend(['remote-8888', 'remote_cache-8888'])
- if 'TegraK1' in bot or 'GTX550Ti' in bot or 'GTX660' in bot or 'GT610' in bot:
- if 'Android' in bot:
- configs.append('nvprmsaa4')
- else:
- configs.append('nvprmsaa16')
+ if '-TSAN' not in bot:
+ if ('TegraK1' in bot or
+ 'GTX550Ti' in bot or
+ 'GTX660' in bot or
+ 'GT610' in bot):
+ if 'Android' in bot:
+ configs.append('nvprmsaa4')
+ else:
+ configs.append('nvprmsaa16')
# The S4 crashes and the NP produces a long error stream when we run with
# MSAA. The Tegra2 and Tegra3 just don't support it.