aboutsummaryrefslogtreecommitdiffhomepage
path: root/infra
diff options
context:
space:
mode:
authorGravatar Ben Wagner <benjaminwagner@google.com>2017-05-25 12:48:16 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-05-25 19:23:47 +0000
commit9b51d1484adc7666d6e93ab76f315b3fd485a562 (patch)
tree0087cd46e5bb849a3462fc85d338f0b41655972c /infra
parent09bcf735f8533e3c1ae58d94ebc94a1ac11a3409 (diff)
Omit more shapes tests for ANGLE Release.
Bug: skia:6534 Change-Id: I182a207ea827451daad5ed7f982289c0a29ce24d No-Try: true Reviewed-on: https://skia-review.googlesource.com/17929 Reviewed-by: Brian Osman <brianosman@google.com> Commit-Queue: Ben Wagner <benjaminwagner@google.com>
Diffstat (limited to 'infra')
-rw-r--r--infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json4
-rw-r--r--infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json2
-rw-r--r--infra/bots/recipes/perf.py8
3 files changed, 11 insertions, 3 deletions
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json
index a866cc57b9..3f787a4eee 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-AlphaR2-GPU-RadeonR9M470X-x86_64-Release-ANGLE.json
@@ -156,8 +156,10 @@
"--match",
"~native_image_to_raster_surface",
"~shapes_mixed_10000_32x33",
- "~shapes_rrect_10000_32x32",
+ "~shapes_oval_10000_32x32",
"~shapes_oval_10000_32x33",
+ "~shapes_rect_100_500x500",
+ "~shapes_rrect_10000_32x32",
"~inc0.gif",
"~inc1.gif",
"~incInterlaced.gif",
diff --git a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json
index a85f320356..4aa5820985 100644
--- a/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json
+++ b/infra/bots/recipes/perf.expected/Perf-Win10-MSVC-ShuttleC-GPU-GTX960-x86_64-Release-ANGLE.json
@@ -156,6 +156,8 @@
"--match",
"~native_image_to_raster_surface",
"~shapes_mixed_10000_32x33",
+ "~shapes_rect_100_500x500",
+ "~shapes_rrect_10000_32x32",
"~inc0.gif",
"~inc1.gif",
"~incInterlaced.gif",
diff --git a/infra/bots/recipes/perf.py b/infra/bots/recipes/perf.py
index ead6feb172..09b4a4a7c5 100644
--- a/infra/bots/recipes/perf.py
+++ b/infra/bots/recipes/perf.py
@@ -151,14 +151,18 @@ def nanobench_flags(bot):
match.append('~Xfermode') # skia:6691
if 'ANGLE' in bot and any('msaa' in x for x in configs):
match.append('~native_image_to_raster_surface') # skia:6457
- if 'ANGLE' in bot and 'Radeon' in bot:
+ if 'ANGLE' in bot and 'Radeon' in bot and 'Release' in bot:
# skia:6534
match.append('~shapes_mixed_10000_32x33')
- match.append('~shapes_rrect_10000_32x32')
+ match.append('~shapes_oval_10000_32x32')
match.append('~shapes_oval_10000_32x33')
+ match.append('~shapes_rect_100_500x500')
+ match.append('~shapes_rrect_10000_32x32')
if 'ANGLE' in bot and 'GTX960' in bot and 'Release' in bot:
# skia:6534
match.append('~shapes_mixed_10000_32x33')
+ match.append('~shapes_rect_100_500x500')
+ match.append('~shapes_rrect_10000_32x32')
# We do not need or want to benchmark the decodes of incomplete images.
# In fact, in nanobench we assert that the full image decode succeeds.