diff options
| author |  Brian Salomon <bsalomon@google.com> | 2017-10-09 13:02:49 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-09 20:24:04 +0000 |
| commit | 7f56d3d2d865a9fed44c420bd3b9497118b7ed26 (patch) | |
| tree | d8f5f15eb65e087d153a783cbfd10cb23939aab6 /infra | |
| parent | c795a4c8862dbab914561fadf7a3567c55362ae4 (diff) | |
Revert "Revert "Disable GL buffer mapping on TSAN/Mac.""
This reverts commit 4e7cdd5a0052aa76bed6f80ec325be19e09e6ab1.
Bug: skia:7058
Change-Id: I3b92c35835cf7a8c04e9218194bf293b790413e0
Reviewed-on: https://skia-review.googlesource.com/57222
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'infra')
| -rw-r--r-- | infra/bots/recipes/test.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py index 6ea5701a76..ffda2a1c95 100644 --- a/infra/bots/recipes/test.py +++ b/infra/bots/recipes/test.py @@ -195,7 +195,8 @@ def dm_flags(api, bot): configs = [x.replace(old, new) for x in configs] # We also test non-msaa instanced. configs.append(new) - elif 'MacMini7.1' in bot: + elif 'MacMini7.1' in bot and 'TSAN' not in bot: + # The TSAN bot disables GL buffer mapping which is required for inst. configs.extend([gl_prefix + 'inst']) # CommandBuffer bot *only* runs the command_buffer config. |