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

Add catapult to RecreateSKPs bot's PYTHONPATH

Browse Source 
TBR=borenet
BUG=skia:5024
NOTRY=true
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1747623002

Review URL: https://codereview.chromium.org/1747623002
This commit is contained in:
rmistry 2016-02-27 10:04:57 -08:00 committed by Commit bot
parent cb3d4fc7d6
commit afaf496910
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/skp/webpages_playback.py
View File

@ -163,6 +163,8 @@ class SkPicturePlayback(object):
self._alternate_upload_dir = parse_options.alternate_upload_dir
self._telemetry_binaries_dir = os.path.join(parse_options.chrome_src_path,
'tools', 'perf')
self._catapult_dir = os.path.join(parse_options.chrome_src_path,
'third_party', 'catapult')
self._local_skp_dir = os.path.join(
parse_options.output_dir, ROOT_PLAYBACK_DIR_NAME, SKPICTURES_DIR_NAME)
@ -251,7 +253,7 @@ class SkPicturePlayback(object):
# Create an archive of the specified webpages if '--record=True' is
# specified.
record_wpr_cmd = (
'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir,
'PYTHONPATH=%s:%s:$PYTHONPATH' % (page_set_dir, self._catapult_dir),
'DISPLAY=%s' % X11_DISPLAY,
os.path.join(self._telemetry_binaries_dir, 'record_wpr'),
'--extra-browser-args="%s"' % self._browser_args,
@ -289,7 +291,7 @@ class SkPicturePlayback(object):
self._DownloadWebpagesArchive(wpr_data_file, page_set_json_name)
run_benchmark_cmd = (
'PYTHONPATH=%s:$PYTHONPATH' % page_set_dir,
'PYTHONPATH=%s:%s:$PYTHONPATH' % (page_set_dir, self._catapult_dir),
'DISPLAY=%s' % X11_DISPLAY,
'timeout', '300',
os.path.join(self._telemetry_binaries_dir, 'run_benchmark'),