AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add ability to specify extra browser args and a prefix for SKP names to webpages_playback.py

Browse Source 
BUG=skia:3763
NOTRY=true

Review URL: https://codereview.chromium.org/1066933006
This commit is contained in:
rmistry 2015-04-23 12:47:33 -07:00 committed by Commit bot
parent e1d7e0f0a5
commit aa31ee78ee
1 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/skp/webpages_playback.py
View File

@ -138,6 +138,10 @@ class SkPicturePlayback(object):
"""Constructs a SkPicturePlayback BuildStep instance.""" """Constructs a SkPicturePlayback BuildStep instance."""
assert parse_options.browser_executable, 'Must specify --browser_executable' assert parse_options.browser_executable, 'Must specify --browser_executable'
self._browser_executable = parse_options.browser_executable self._browser_executable = parse_options.browser_executable
self._browser_args = '--disable-setuid-sandbox'
if parse_options.browser_extra_args:
self._browser_args = '%s %s' % (
self._browser_args, parse_options.browser_extra_args)
self._chrome_page_sets_path = os.path.join(parse_options.chrome_src_path, self._chrome_page_sets_path = os.path.join(parse_options.chrome_src_path,
CHROMIUM_PAGE_SETS_PATH) CHROMIUM_PAGE_SETS_PATH)
@ -148,6 +152,7 @@ class SkPicturePlayback(object):
self._skia_tools = parse_options.skia_tools self._skia_tools = parse_options.skia_tools
self._non_interactive = parse_options.non_interactive self._non_interactive = parse_options.non_interactive
self._upload = parse_options.upload self._upload = parse_options.upload
self._skp_prefix = parse_options.skp_prefix
data_store_location = parse_options.data_store data_store_location = parse_options.data_store
if data_store_location.startswith(gs_utils.GS_PREFIX): if data_store_location.startswith(gs_utils.GS_PREFIX):
self.gs = GoogleStorageDataStore(data_store_location) self.gs = GoogleStorageDataStore(data_store_location)
@ -247,7 +252,7 @@ class SkPicturePlayback(object):
'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir, 'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir,
'DISPLAY=%s' % X11_DISPLAY, 'DISPLAY=%s' % X11_DISPLAY,
os.path.join(self._telemetry_binaries_dir, 'record_wpr'), os.path.join(self._telemetry_binaries_dir, 'record_wpr'),
'--extra-browser-args=--disable-setuid-sandbox', '--extra-browser-args="%s"' % self._browser_args,
'--browser=exact', '--browser=exact',
'--browser-executable=%s' % self._browser_executable, '--browser-executable=%s' % self._browser_executable,
'%s_page_set' % page_set_basename, '%s_page_set' % page_set_basename,
@ -286,7 +291,7 @@ class SkPicturePlayback(object):
'DISPLAY=%s' % X11_DISPLAY, 'DISPLAY=%s' % X11_DISPLAY,
'timeout', '300', 'timeout', '300',
os.path.join(self._telemetry_binaries_dir, 'run_benchmark'), os.path.join(self._telemetry_binaries_dir, 'run_benchmark'),
'--extra-browser-args=--disable-setuid-sandbox', '--extra-browser-args="%s"' % self._browser_args,
'--browser=exact', '--browser=exact',
'--browser-executable=%s' % self._browser_executable, '--browser-executable=%s' % self._browser_executable,
SKP_BENCHMARK, SKP_BENCHMARK,
@ -409,6 +414,9 @@ class SkPicturePlayback(object):
filename = self._GetSkiaSkpFileName(page_set) filename = self._GetSkiaSkpFileName(page_set)
filename = filename.lower() filename = filename.lower()
if self._skp_prefix:
filename = '%s%s' % (self._skp_prefix, filename)
# We choose the largest .skp as the most likely to be interesting. # We choose the largest .skp as the most likely to be interesting.
largest_skp = max(glob.glob(os.path.join(site, '*.skp')), largest_skp = max(glob.glob(os.path.join(site, '*.skp')),
key=lambda path: os.stat(path).st_size) key=lambda path: os.stat(path).st_size)
@ -545,6 +553,10 @@ if '__main__' == __name__:
'', '--browser_executable', '', '--browser_executable',
help='The exact browser executable to run.', help='The exact browser executable to run.',
default=None) default=None)
option_parser.add_option(
'', '--browser_extra_args',
help='Additional arguments to pass to the browser.',
default=None)
option_parser.add_option( option_parser.add_option(
'', '--chrome_src_path', '', '--chrome_src_path',
help='Path to the chromium src directory.', help='Path to the chromium src directory.',
@ -554,6 +566,10 @@ if '__main__' == __name__:
help='Runs the script without any prompts. If this flag is specified and ' help='Runs the script without any prompts. If this flag is specified and '
'--skia_tools is specified then the debugger is not run.', '--skia_tools is specified then the debugger is not run.',
default=False) default=False)
option_parser.add_option(
'', '--skp_prefix',
help='Prefix to add to the names of generated SKPs.',
default=None)
options, unused_args = option_parser.parse_args() options, unused_args = option_parser.parse_args()
playback = SkPicturePlayback(options) playback = SkPicturePlayback(options)