diff options
author | Brian Salomon <bsalomon@google.com> | 2017-03-20 14:22:04 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-03-20 19:00:19 +0000 |
commit | 9c614669fcc9dfc30225ac80d6e2673f02d4432a (patch) | |
tree | 80b36cd1d10b73154b3b8e59ed695aa8cff4bc20 /infra | |
parent | b1168a7c9a360bf80b447e2e399bdc5721d5152e (diff) |
Disable msaa nanobench on iOS due to crashes
BUG=skia:6399
Change-Id: I9351579cdc78a59a99cc9ecbcac0c5146d186bd1
Reviewed-on: https://skia-review.googlesource.com/9902
Reviewed-by: Ben Wagner <benjaminwagner@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
Diffstat (limited to 'infra')
-rw-r--r-- | infra/bots/recipe_modules/perf/api.py | 3 | ||||
-rw-r--r-- | infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py index bfa7417a14..41e438461c 100644 --- a/infra/bots/recipe_modules/perf/api.py +++ b/infra/bots/recipe_modules/perf/api.py @@ -43,7 +43,8 @@ def nanobench_flags(bot): if 'NVIDIA_Shield' not in bot: gl_prefix = 'gles' # The NP produces a long error stream when we run with MSAA. - if 'NexusPlayer' in bot: + # iOS crashes (skia:6399) + if 'NexusPlayer' in bot or 'iOS' in bot: sample_count = '' config.append(gl_prefix) diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json index 81db009b82..c7d31a8d5c 100644 --- a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json +++ b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json @@ -372,7 +372,7 @@ "[START_DIR]/out/Release/nanobench.app", "-I", "--args", - "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 nonrendering hwui gles glesmsaa4 glesnvpr4 glesnvprdit4 --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS" + "--undefok -i resources --skps skps --images images/nanobench --svgs svgs --nocpu --pre_log --images --gpuStatsDump true --scales 1.0 1.1 --skps ignore_skps --config 8888 nonrendering hwui gles --match ~blurroundrect ~patch_grid ~desk_carsvg ~keymobi ~path_hairline ~GLInstancedArraysBench ~inc0.gif ~inc1.gif ~incInterlaced.gif ~inc0.jpg ~incGray.jpg ~inc0.wbmp ~inc1.wbmp ~inc0.webp ~inc1.webp ~inc0.ico ~inc1.ico ~inc0.png ~inc1.png ~inc2.png ~inc12.png ~inc13.png ~inc14.png ~inc0.webp ~inc1.webp --outResultsFile perf/nanobench_abc123_1337000001.json --properties gitHash abc123 build_number 5 --key arch arm compiler Clang cpu_or_gpu GPU cpu_or_gpu_value GX6450 model iPadMini4 os iOS" ], "cwd": "[START_DIR]/skia", "env": { |