diff options
| author |  djsollen <djsollen@google.com> | 2015-06-10 09:05:14 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-06-10 09:05:14 -0700 |
| commit | e21585eabf18b9919701b14576b6876c0fd86735 (patch) | |
| tree | 21019540df476325ef12f70ec164af8898ca0212 /tools | |
| parent | f2fe0e03205c4d7f70496ec8c6bea9a82ae88329 (diff) | |
Update flags passed to Android GPU bots to exclude running skps and image sources.
Review URL: https://codereview.chromium.org/1176923003
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/dm_flags.json | 132 | ||||
| -rwxr-xr-x | tools/dm_flags.py | 11 |
2 files changed, 17 insertions, 126 deletions
diff --git a/tools/dm_flags.json b/tools/dm_flags.json index a075e4e203..c864ab6b1b 100644 --- a/tools/dm_flags.json +++ b/tools/dm_flags.json @@ -170,6 +170,9 @@ "pipe-8888", "--threads", "0", + "--src", + "tests", + "gm", "--blacklist", "gpu", "_", @@ -283,30 +286,6 @@ "image", "decode", "Hopstarter-Mac-Folders-Apple.ico", - "gpu", - "skp", - "_", - "_", - "msaa", - "skp", - "_", - "_", - "gpu", - "image", - "decode", - "_", - "msaa", - "image", - "decode", - "_", - "gpu", - "image", - "subset", - "_", - "msaa", - "image", - "subset", - "_", "--match", "~WritePixels", "~tabl_mozilla_0", @@ -322,6 +301,9 @@ "pipe-8888", "--threads", "0", + "--src", + "tests", + "gm", "--blacklist", "gpu", "_", @@ -435,30 +417,6 @@ "image", "decode", "Hopstarter-Mac-Folders-Apple.ico", - "gpu", - "skp", - "_", - "_", - "msaa", - "skp", - "_", - "_", - "gpu", - "image", - "decode", - "_", - "msaa", - "image", - "decode", - "_", - "gpu", - "image", - "subset", - "_", - "msaa", - "image", - "subset", - "_", "--match", "~tabl_mozilla_0", "~desk_yahoonews_0" @@ -471,6 +429,9 @@ "serialize-8888", "tiles_rt-8888", "pipe-8888", + "--src", + "tests", + "gm", "--blacklist", "gpu", "_", @@ -584,30 +545,6 @@ "image", "decode", "Hopstarter-Mac-Folders-Apple.ico", - "gpu", - "skp", - "_", - "_", - "msaa", - "skp", - "_", - "_", - "gpu", - "image", - "decode", - "_", - "msaa", - "image", - "decode", - "_", - "gpu", - "image", - "subset", - "_", - "msaa", - "image", - "subset", - "_", "--match", "~tabl_mozilla_0", "~desk_yahoonews_0" @@ -622,6 +559,9 @@ "serialize-8888", "tiles_rt-8888", "pipe-8888", + "--src", + "tests", + "gm", "--blacklist", "gpu", "_", @@ -735,30 +675,6 @@ "image", "decode", "Hopstarter-Mac-Folders-Apple.ico", - "gpu", - "skp", - "_", - "_", - "msaa", - "skp", - "_", - "_", - "gpu", - "image", - "decode", - "_", - "msaa", - "image", - "decode", - "_", - "gpu", - "image", - "subset", - "_", - "msaa", - "image", - "subset", - "_", "--match", "~tabl_mozilla_0", "~desk_yahoonews_0" @@ -881,30 +797,6 @@ "image", "decode", "Hopstarter-Mac-Folders-Apple.ico", - "gpu", - "skp", - "_", - "_", - "msaa", - "skp", - "_", - "_", - "gpu", - "image", - "decode", - "_", - "msaa", - "image", - "decode", - "_", - "gpu", - "image", - "subset", - "_", - "msaa", - "image", - "subset", - "_", "--match", "~tabl_mozilla_0", "~desk_yahoonews_0", diff --git a/tools/dm_flags.py b/tools/dm_flags.py index fd945a5b54..ea657f8e6c 100755 --- a/tools/dm_flags.py +++ b/tools/dm_flags.py @@ -118,12 +118,11 @@ def get_args(bot): blacklist.extend('pdf gm _ fontmgr_iter_factory'.split(' ')) # Drawing SKPs or images into GPU canvases is a New Thing. - # It seems like we're running out of RAM on some Android bots, so start off - # with a very wide blacklist disabling all these tests on all Android bots. - if 'Android' in bot: # skia:3255 - blacklist.extend('gpu skp _ _ msaa skp _ _'.split(' ')) - blacklist.extend('gpu image decode _ msaa image decode _'.split(' ')) - blacklist.extend('gpu image subset _ msaa image subset _'.split(' ')) + # We are running out of RAM on some Android bots, so we are restricting + # all GPU Android bots to only run tests and GMs. + if ('Android' in bot and + 'GPU' in bot): + args.extend('--src tests gm'.split(' ')) if 'Valgrind' in bot: # PDF + .webp -> jumps depending on uninitialized memory. skia:3505 |