From 19ea45ef538b0cbcd2088e85fa7e88384d6932e3 Mon Sep 17 00:00:00 2001 From: Ravi Mistry Date: Wed, 29 Nov 2017 08:38:12 -0500 Subject: Exclude URLs only for some page sets Bug: skia:7348 Change-Id: Iabf4c0d0bf83a0caeeb06027e5617a18900ac5fc Reviewed-on: https://skia-review.googlesource.com/77180 Reviewed-by: Eric Boren Commit-Queue: Ravi Mistry --- tools/skp/webpages_playback.py | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py index 10f1a2912b..6a8562b158 100644 --- a/tools/skp/webpages_playback.py +++ b/tools/skp/webpages_playback.py @@ -115,6 +115,11 @@ CHROMIUM_PAGE_SETS_TO_PREFIX = { 'top_25_smooth.py': 'top25desk', } +PAGE_SETS_TO_EXCLUSIONS = { + # See skbug.com/7348 + 'key_mobile_sites_smooth.py': '"(digg|worldjournal)"', +} + def remove_prefix(s, prefix): if s.startswith(prefix): @@ -278,7 +283,7 @@ class SkPicturePlayback(object): # Get the webpages archive so that it can be replayed. self._DownloadWebpagesArchive(wpr_data_file, page_set_json_name) - run_benchmark_cmd = ( + run_benchmark_cmd = [ 'PYTHONPATH=%s:%s:$PYTHONPATH' % (page_set_dir, self._catapult_dir), 'DISPLAY=%s' % X11_DISPLAY, 'timeout', '1800', @@ -291,9 +296,11 @@ class SkPicturePlayback(object): '--page-set-base-dir=%s' % page_set_dir, '--skp-outdir=%s' % TMP_SKP_DIR, '--also-run-disabled-tests', - # See skbug.com/7348 - '--story-filter-exclude="(digg|worldjournal)"', - ) + ] + + exclusions = PAGE_SETS_TO_EXCLUSIONS.get(os.path.basename(page_set)) + if exclusions: + run_benchmark_cmd.append('--story-filter-exclude=' + exclusions) for _ in range(RETRY_RUN_MEASUREMENT_COUNT): try: -- cgit v1.2.3