diff options
| author |  rmistry <rmistry@google.com> | 2016-02-27 10:04:57 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-02-27 10:04:57 -0800 |
| commit | afaf4969104241900d27e69fe25ecb5878a78d53 (patch) | |
| tree | 98669c80e91ab25f8ac87fa9c015669c15e3072e /tools/skp | |
| parent | cb3d4fc7d6fa8e303983b5a0c185737a5ba6bc02 (diff) | |
Add catapult to RecreateSKPs bot's PYTHONPATH
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
Diffstat (limited to 'tools/skp')
| -rw-r--r-- | tools/skp/webpages_playback.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/tools/skp/webpages_playback.py b/tools/skp/webpages_playback.py index 1284a540e8..d5f45d65e6 100644 --- a/tools/skp/webpages_playback.py +++ b/tools/skp/webpages_playback.py @@ -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'), |