Add catapult to RecreateSKPs bot's PYTHONPATH

tools/skp/webpages_playback.py

 #!/usr/bin/env python
 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Archives or replays webpages and creates SKPs in a Google Storage location.
 
 To archive webpages and store SKP files (archives should be rarely updated):
 
 cd skia
@@ skipping 145 matching lines @@
     self._skp_prefix = parse_options.skp_prefix
     data_store_location = parse_options.data_store
     if data_store_location.startswith(gs_utils.GS_PREFIX):
       self.gs = GoogleStorageDataStore(data_store_location)
     else:
       self.gs = LocalFileSystemDataStore(data_store_location)
     self._upload_to_partner_bucket = parse_options.upload_to_partner_bucket
     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)
     self._local_record_webpages_archive_dir = os.path.join(
         parse_options.output_dir, ROOT_PLAYBACK_DIR_NAME, 'webpages_archive')
 
     # List of SKP files generated by this script.
     self._skp_files = []
 
   def _ParsePageSets(self, page_sets):
@@ skipping 68 matching lines @@
       page_set_json_name = page_set_basename + '.json'
       wpr_data_file = page_set.split(os.path.sep)[-1].split('.')[0] + '_000.wpr'
       page_set_dir = os.path.dirname(page_set)
 
       if self._IsChromiumPageSet(page_set):
         print 'Using Chromium\'s captured archives for Chromium\'s page sets.'
       elif self._record:
         # 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,
           '--browser=exact',
           '--browser-executable=%s' % self._browser_executable,
           '%s_page_set' % page_set_basename,
           '--page-set-base-dir=%s' % page_set_dir
         )
         for _ in range(RETRY_RECORD_WPR_COUNT):
           try:
@@ skipping 17 matching lines @@
         else:
           # If we get here then record_wpr did not succeed and thus did not
           # break out of the loop.
           raise Exception('record_wpr failed for page_set: %s' % page_set)
 
       else:
         # Get the webpages archive so that it can be replayed.
         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'),
           '--extra-browser-args="%s"' % self._browser_args,
           '--browser=exact',
           '--browser-executable=%s' % self._browser_executable,
           SKP_BENCHMARK,
           '--page-set-name=%s' % page_set_basename,
           '--page-set-base-dir=%s' % page_set_dir,
           '--skp-outdir=%s' % TMP_SKP_DIR,
@@ skipping 289 matching lines @@
            '--skia_tools is specified then the debugger is not run.',
       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()
 
   playback = SkPicturePlayback(options)
   sys.exit(playback.Run())