aboutsummaryrefslogtreecommitdiffhomepage
path: root/tools
diff options
context:
space:
mode:
authorGravatar borenet <borenet@google.com>2015-05-06 08:33:51 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2015-05-06 08:33:51 -0700
commitd9b6be197fe9cc75e068aaaf941455c13b2e38c3 (patch)
treed41eca822944e7cbae798d076c0e8d20caddadfc /tools
parent620ba3afe09d4173c87537040fe50c1c1895fb1a (diff)
Remove upright-matrix- configs from Android bots
The Android bots are flaking like crazy. I'm not sure if these configs are hurting the situation, but let's see if this helps. TBR=mtklein,halcanary BUG=skia: Review URL: https://codereview.chromium.org/1131603002
Diffstat (limited to 'tools')
-rw-r--r--tools/dm_flags.json35
-rwxr-xr-xtools/dm_flags.py6
2 files changed, 4 insertions, 37 deletions
diff --git a/tools/dm_flags.json b/tools/dm_flags.json
index 9c329af8e8..469e2ae48c 100644
--- a/tools/dm_flags.json
+++ b/tools/dm_flags.json
@@ -161,17 +161,10 @@
"~WritePixels"
],
"Test-Android-GCC-GalaxyS3-GPU-Mali400-Arm7-Debug": [
- "--matrix",
- "0",
- "1",
- "1",
- "0",
"--config",
"565",
"8888",
"gpu",
- "upright-matrix-8888",
- "upright-matrix-gpu",
"msaa4",
"serialize-8888",
"tiles_rt-8888",
@@ -322,17 +315,10 @@
"~desk_yahoonews_0"
],
"Test-Android-GCC-GalaxyS4-GPU-SGX544-Arm7-Release": [
- "--matrix",
- "0",
- "1",
- "1",
- "0",
"--config",
"565",
"8888",
"gpu",
- "upright-matrix-8888",
- "upright-matrix-gpu",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@@ -485,17 +471,10 @@
"~desk_yahoonews_0"
],
"Test-Android-GCC-Nexus7-GPU-Tegra3-Arm7-Release": [
- "--matrix",
- "0",
- "1",
- "1",
- "0",
"--config",
"565",
"8888",
"gpu",
- "upright-matrix-8888",
- "upright-matrix-gpu",
"serialize-8888",
"tiles_rt-8888",
"pipe-8888",
@@ -642,17 +621,10 @@
"~desk_yahoonews_0"
],
"Test-Android-GCC-Nexus9-GPU-TegraK1-Arm64-Debug": [
- "--matrix",
- "0",
- "1",
- "1",
- "0",
"--config",
"565",
"8888",
"gpu",
- "upright-matrix-8888",
- "upright-matrix-gpu",
"nvprmsaa4",
"msaa4",
"serialize-8888",
@@ -801,17 +773,10 @@
"~desk_yahoonews_0"
],
"Test-Android-GCC-NexusPlayer-CPU-SSSE3-x86-Release": [
- "--matrix",
- "0",
- "1",
- "1",
- "0",
"--config",
"565",
"8888",
"gpu",
- "upright-matrix-8888",
- "upright-matrix-gpu",
"--blacklist",
"gpu",
"_",
diff --git a/tools/dm_flags.py b/tools/dm_flags.py
index c060b20157..b461af50db 100755
--- a/tools/dm_flags.py
+++ b/tools/dm_flags.py
@@ -29,9 +29,11 @@ cov_start = lineno()+1 # We care about coverage starting just past this def.
def get_args(bot):
args = []
- configs = ['565', '8888', 'gpu', 'upright-matrix-8888', 'upright-matrix-gpu']
+ configs = ['565', '8888', 'gpu']
- args.extend('--matrix 0 1 1 0'.split(' '))
+ if 'Android' not in bot:
+ configs.extend(('upright-matrix-8888', 'upright-matrix-gpu'))
+ args.extend('--matrix 0 1 1 0'.split(' '))
if 'TegraK1' in bot or 'GTX550Ti' in bot or 'GTX660' in bot or 'GT610' in bot:
if 'Android' in bot: