Changeset 56876 in webkit


Ignore:
Timestamp:
Mar 31, 2010 4:45:48 PM (14 years ago)
Author:
victorw@chromium.org
Message:

2010-03-30 Victor Wang <victorw@chromium.org>

Reviewed by Eric Seidel.

Update rebaseline tool to check the release image diff binary and
fallback to debug if the release version does not exist.

https://bugs.webkit.org/show_bug.cgi?id=36245

  • Scripts/webkitpy/layout_tests/port/base.py:
  • Scripts/webkitpy/layout_tests/port/chromium.py:
  • Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
Location:
trunk/WebKitTools
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebKitTools/ChangeLog

    r56874 r56876  
     12010-03-30  Victor Wang  <victorw@chromium.org>
     2
     3        Reviewed by Eric Seidel.
     4
     5        Update rebaseline tool to check the release image diff binary and
     6        fallback to debug if the release version does not exist.
     7
     8        https://bugs.webkit.org/show_bug.cgi?id=36245
     9
     10        * Scripts/webkitpy/layout_tests/port/base.py:
     11        * Scripts/webkitpy/layout_tests/port/chromium.py:
     12        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
     13
    1142010-03-31  Eric Seidel  <eric@webkit.org>
    215
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py

    r56652 r56876  
    8282        Returns whether the system is properly configured."""
    8383        return True
     84
     85    def check_image_diff(self, override_step=None, logging=True):
     86        """This routine is used to check whether image_diff binary exists."""
     87        raise NotImplemented('Port.check_image_diff')
    8488
    8589    def compare_text(self, expected_text, actual_text):
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py

    r56366 r56876  
    4545
    4646
    47 def check_file_exists(path_to_file, file_description, override_step=None):
     47def check_file_exists(path_to_file, file_description, override_step=None,
     48                      logging=True):
    4849    """Verify the file is present where expected or log an error.
    4950
     
    5152        file_name: The (human friendly) name or description of the file
    5253            you're looking for (e.g., "HTTP Server"). Used for error logging.
    53         override_step: An optional string to be logged if the check fails."""
     54        override_step: An optional string to be logged if the check fails.
     55        logging: Whether or not log the error messages."""
    5456    if not os.path.exists(path_to_file):
    55         _log.error('Unable to find %s' % file_description)
    56         _log.error('    at %s' % path_to_file)
    57         if override_step:
    58             _log.error('    %s' % override_step)
    59             _log.error('')
     57        if logging:
     58            _log.error('Unable to find %s' % file_description)
     59            _log.error('    at %s' % path_to_file)
     60            if override_step:
     61                _log.error('    %s' % override_step)
     62                _log.error('')
    6063        return False
    6164    return True
     
    8992
    9093        if not self._options.no_pixel_tests:
    91             image_diff_path = self._path_to_image_diff()
    92             result = check_file_exists(image_diff_path, 'image diff exe',
     94            result = self.check_image_diff(
    9395                'To override, invoke with --no-pixel-tests') and result
    9496
     
    105107            return False
    106108        return True
     109
     110    def check_image_diff(self, override_step=None, logging=True):
     111        image_diff_path = self._path_to_image_diff()
     112        return check_file_exists(image_diff_path, 'image diff exe',
     113                                 override_step, logging)
    107114
    108115    def path_from_chromium_base(self, *comps):
  • trunk/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py

    r56817 r56876  
    994994    # on non-Chromium ports yet. We should fix that.
    995995    options.chromium = True
    996     port_obj = port.get(None, options)
    997996
    998997    # Set up our logging format.
     
    10041003                                '%(levelname)s %(message)s'),
    10051004                        datefmt='%y%m%d %H:%M:%S')
     1005
     1006    # options.target is used by port to locate image_diff binary.
     1007    # Check the imgage_diff release binary, if it does not exist,
     1008    # fallback to debug.
     1009    options.target = "release"
     1010    port_obj = port.get(None, options)
     1011    if not port_obj.check_image_diff(override_step=None, logging=False):
     1012        _log.debug('No release version image diff binary found.')
     1013        options.target = "debug"
     1014        port_obj = port.get(None, options)
     1015    else:
     1016       _log.debug('Found release version image diff binary.')
    10061017
    10071018    # Verify 'platforms' option is valid
Note: See TracChangeset for help on using the changeset viewer.