diff options
Diffstat (limited to 'gm/rebaseline_server/compare_rendered_pictures.py')
-rwxr-xr-x | gm/rebaseline_server/compare_rendered_pictures.py | 21 |
1 files changed, 3 insertions, 18 deletions
diff --git a/gm/rebaseline_server/compare_rendered_pictures.py b/gm/rebaseline_server/compare_rendered_pictures.py index 75a80d4de2..73d0627ba0 100755 --- a/gm/rebaseline_server/compare_rendered_pictures.py +++ b/gm/rebaseline_server/compare_rendered_pictures.py @@ -13,26 +13,11 @@ Compare results of two render_pictures runs. import logging import os import re -import sys import time # Imports from within Skia -# -# TODO(epoger): Once we move the create_filepath_url() function out of -# download_actuals into a shared utility module, we won't need to import -# download_actuals anymore. -# -# We need to add the 'gm' directory, so that we can import gm_json.py within -# that directory. That script allows us to parse the actual-results.json file -# written out by the GM tool. -# Make sure that the 'gm' dir is in the PYTHONPATH, but add it at the *end* -# so any dirs that are already in the PYTHONPATH will be preferred. -PARENT_DIRECTORY = os.path.dirname(os.path.realpath(__file__)) -GM_DIRECTORY = os.path.dirname(PARENT_DIRECTORY) -TRUNK_DIRECTORY = os.path.dirname(GM_DIRECTORY) -if GM_DIRECTORY not in sys.path: - sys.path.append(GM_DIRECTORY) -import download_actuals +import fix_pythonpath # must do this first +from pyutils import url_utils import gm_json import imagediffdb import imagepair @@ -74,7 +59,7 @@ class RenderedPicturesComparisons(results.BaseComparisons): self._image_base_url = image_base_url self._diff_base_url = ( diff_base_url or - download_actuals.create_filepath_url(generated_images_root)) + url_utils.create_filepath_url(generated_images_root)) self._load_result_pairs(actuals_root, subdirs) self._timestamp = int(time.time()) logging.info('Results complete; took %d seconds.' % |