aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools/dm_flags.py
diff options
context:
space:
mode:
authorGravatar mtklein <mtklein@google.com>2015-02-25 08:16:19 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2015-02-25 08:16:19 -0800
commitee2a3eaf996826ec603748c7f79d4d6b5cf0ecc3 (patch)
tree4d86b9629f92857b2d6ab1f2d2f8fffb477ff128 /tools/dm_flags.py
parentfbe0edfec4fed2a09e12b049d527d280f16e75b3 (diff)
Revert of Default SK_ANGLE to true on Windows, run angle whenever possible on bots. (patchset #3 id:40001 of https://codereview.chromium.org/946933006/)
Reason for revert: Needs bot upgrades. Original issue's description: > Default SK_ANGLE to true on Windows, run angle whenever possible on bots. > > nanobench doesn't need an update. It uses the default for --config, > which includes angle. > > BUG=skia: > > Committed: https://skia.googlesource.com/skia/+/88ec329b580a081d9d56cbcaad0ee46cb941c849 TBR=bsalomon@google.com,mtklein@chromium.org NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia: Review URL: https://codereview.chromium.org/954243002
Diffstat (limited to 'tools/dm_flags.py')
-rwxr-xr-xtools/dm_flags.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index c41a003c51..985a62adf5 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -22,13 +22,15 @@ cov_start = lineno()+1 # We care about coverage starting just past this def.
def get_args(bot):
args = []
- configs = ['565', '8888', 'gpu', 'nvprmsaa4', 'angle']
+ configs = ['565', '8888', 'gpu', 'nvprmsaa4']
# Xoom and NP are running out of RAM when we run all these modes. skia:3255
if ('Xoom' not in bot and
'NexusPlayer' not in bot):
configs.extend(mode + '-8888' for mode in
['serialize', 'tiles_rt', 'pipe'])
configs.append('tiles_rt-gpu')
+ if 'ANGLE' in bot:
+ configs.append('angle')
args.append('--config')
args.extend(configs)
@@ -86,6 +88,7 @@ def self_test():
'Test-Android-Xoom-Tegra2-Arm7-Release',
'Test-ChromeOS-Alex-GMA3150-x86-Debug',
'Test-Ubuntu12-ShuttleA-GTX550Ti-x86_64-Release-Valgrind',
+ 'Test-Win7-ShuttleA-HD2000-x86-Debug-ANGLE',
]
cov = coverage.coverage()