Changeset 56876 in webkit
- Timestamp:
- Mar 31, 2010 4:45:48 PM (14 years ago)
- Location:
- trunk/WebKitTools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/WebKitTools/ChangeLog
r56874 r56876 1 2010-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 1 14 2010-03-31 Eric Seidel <eric@webkit.org> 2 15 -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
r56652 r56876 82 82 Returns whether the system is properly configured.""" 83 83 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') 84 88 85 89 def compare_text(self, expected_text, actual_text): -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py
r56366 r56876 45 45 46 46 47 def check_file_exists(path_to_file, file_description, override_step=None): 47 def check_file_exists(path_to_file, file_description, override_step=None, 48 logging=True): 48 49 """Verify the file is present where expected or log an error. 49 50 … … 51 52 file_name: The (human friendly) name or description of the file 52 53 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.""" 54 56 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('') 60 63 return False 61 64 return True … … 89 92 90 93 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( 93 95 'To override, invoke with --no-pixel-tests') and result 94 96 … … 105 107 return False 106 108 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) 107 114 108 115 def path_from_chromium_base(self, *comps): -
trunk/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py
r56817 r56876 994 994 # on non-Chromium ports yet. We should fix that. 995 995 options.chromium = True 996 port_obj = port.get(None, options)997 996 998 997 # Set up our logging format. … … 1004 1003 '%(levelname)s %(message)s'), 1005 1004 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.') 1006 1017 1007 1018 # Verify 'platforms' option is valid
Note: See TracChangeset
for help on using the changeset viewer.