Test non-msaa instanced rendering on Mac
Change-Id: I28b67ccef7bb72e4853a0eb02d1de00b1ed40cce
Reviewed-on: https://skia-review.googlesource.com/33001
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
diff --git a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
index 84d7b2a..5eb5e87 100644
--- a/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
+++ b/infra/bots/recipes/test.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Debug.json
@@ -261,7 +261,6 @@
"tiles_rt-8888",
"pic-8888",
"glinst",
- "glinst8",
"--src",
"tests",
"gm",
diff --git a/infra/bots/recipes/test.py b/infra/bots/recipes/test.py
index 5ea17d4..a34cfba 100644
--- a/infra/bots/recipes/test.py
+++ b/infra/bots/recipes/test.py
@@ -142,8 +142,8 @@
configs = [x.replace(old, new) for x in configs]
# We also test non-msaa instanced.
configs.append(new)
- elif 'MacMini6.2' in bot and sample_count is not '':
- configs.extend([gl_prefix + 'inst', gl_prefix + 'inst' + sample_count])
+ elif 'MacMini6.2' in bot:
+ configs.extend([gl_prefix + 'inst'])
# CommandBuffer bot *only* runs the command_buffer config.
if 'CommandBuffer' in bot: