diff options
| author |  Eric Boren <borenet@google.com> | 2017-06-28 13:50:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-28 18:46:16 +0000 |
| commit | 89cd35795f7cc3042084fb14fec27102c6e67f2c (patch) | |
| tree | 94c732f308d4bc2e64e9c4226cdf5fbbf53378c6 /infra/bots/recipes/test.py | |
| parent | a4f792da37eada1dcc05c50b152e20ac36a0977c (diff) | |
Fix recipes/tests for new Debian bots
Bug: skia:6612
Change-Id: I2920bb7b1aa3ebb021223ed6345f13f1f9c8bc24
Reviewed-on: https://skia-review.googlesource.com/21141
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Eric Boren <borenet@google.com>
Diffstat (limited to 'infra/bots/recipes/test.py')
| -rw-r--r-- | infra/bots/recipes/test.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index b05ea5fa71..e2a42d98c2 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -24,7 +24,7 @@ DEPS = [ ] -def dm_flags(bot): +def dm_flags(api, bot): args = [] # This enables non-deterministic random seeding of the GPU FP optimization @@ -103,7 +103,7 @@ def dm_flags(bot): # We want to test both the OpenGL config and the GLES config on Linux Intel: # GL is used by Chrome, GLES is used by ChromeOS. - if 'Intel' in bot and 'Ubuntu' in bot: + if 'Intel' in bot and api.vars.is_linux: configs.extend(['gles', 'glesdft', 'glessrgb']) # NP is running out of RAM when we run all these modes. skia:3255 @@ -442,10 +442,10 @@ def dm_flags(bot): '~bitmapfilters', # skia:6132 '~GrContextFactory_abandon']) #skia:6209 - if 'Vulkan' in bot and 'IntelIris540' in bot and 'Ubuntu' in bot: + if 'Vulkan' in bot and 'IntelIris540' in bot and api.vars.is_linux: match.extend(['~VkHeapTests']) # skia:6245 - if 'Intel' in bot and 'Ubuntu' in bot and not 'Vulkan' in bot: + if 'Intel' in bot and api.vars.is_linux and not 'Vulkan' in bot: # TODO(dogben): Track down what's causing bots to die. verbose = True @@ -530,7 +530,7 @@ def dm_flags(bot): # skia:6141 blacklist([config, 'gm', '_', 'discard']) - if 'IntelBayTrail' in bot and 'Ubuntu' in bot: + if 'IntelBayTrail' in bot and api.vars.is_linux: match.append('~ImageStorageLoad') # skia:6358 if 'Ci20' in bot: @@ -700,7 +700,7 @@ def test_steps(api): skip_flag = '--nocpu' if skip_flag: args.append(skip_flag) - args.extend(dm_flags(api.vars.builder_name)) + args.extend(dm_flags(api, api.vars.builder_name)) env = {} if 'Ubuntu16' in api.vars.builder_name: |