Changeset 57290 in webkit

Timestamp:

Apr 8, 2010 1:47:06 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-04-07 Laszlo Gombos <Laszlo Gombos>

Reviewed by Kenneth Rohde Christiansen.

[Qt] Fix trunk (non-standalone) builds for Symbian
​https://bugs.webkit.org/show_bug.cgi?id=37136

Test for source files before building instead of relying on
standalone_package config.

• WebKit.pro:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/mac.py (modified) (3 diffs)
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py (modified) (14 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-07  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Enable rebaseline-chromium-webkit-tests to run from a webkit-only
+        checkout (i.e., you don't need anything from the Chromium tree checked
+        out). This requires us to introduce the concept of a "target"
+        port/platform that we use to get configuration information from as well
+        as the "running" port that we use to make directories and diff images
+        and the "rebaselining" port we use to actually manage baselines.
+
+        https://bugs.webkit.org/show_bug.cgi?id=37238
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+
 2010-04-05  Antonio Gomes  <tonikitoo@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py

@@ -63 +63 @@
         # FIXME: disable pixel tests until they are run by default on the
         # build machines.
-        if options and options.pixel_tests is None:
+        if options and (not hasattr(options, "pixel_tests") or
+           options.pixel_tests is None):
             options.pixel_tests = False
 
@@ -87 +88 @@
             return False
 
+        if not self.check_image_diff():
+            return False
+
         driver_path = self._path_to_driver()
         if not os.path.exists(driver_path):
             _log.error("DumpRenderTree was not found at %s" % driver_path)
-            return False
-
-        image_diff_path = self._path_to_image_diff()
-        if not os.path.exists(image_diff_path):
-            _log.error("ImageDiff was not found at %s" % image_diff_path)
             return False
 
@@ -103 +102 @@
             return False
 
+        return True
+
+    def check_image_diff(self, override_step=None, logging=True):
+        image_diff_path = self._path_to_image_diff()
+        if not os.path.exists(image_diff_path):
+            _log.error("ImageDiff was not found at %s" % image_diff_path)
+            return False
         return True
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py

@@ -42 +42 @@
 """
 
+import copy
 import logging
 import optparse
@@ -204 +205 @@
     REVISION_REGEX = r'<a href=\"(\d+)/\">'
 
-    def __init__(self, running_port, platform, options):
+    def __init__(self, running_port, target_port, platform, options):
+        """
+        Args:
+            running_port: the Port the script is running on.
+            target_port: the Port the script uses to find port-specific
+                configuration information like the test_expectations.txt
+                file location and the list of test platforms.
+            platform: the test platform to rebaseline
+            options: the command-line options object."""
         self._platform = platform
         self._options = options
-        # This is the port that the script is running on.
         self._port = running_port
-        # This is the port that the rebaselining tool creates new baselines for.
+        self._target_port = target_port
         self._rebaseline_port = port.get(
-            self._port.test_platform_name_to_name(platform), options)
+            self._target_port.test_platform_name_to_name(platform), options)
         self._rebaselining_tests = []
         self._rebaselined_tests = []
@@ -505 +513 @@
           False otherwise.
         """
-        test_filepath = os.path.join(self._port.layout_tests_dir(), test)
+        test_filepath = os.path.join(self._target_port.layout_tests_dir(),
+                                     test)
         all_baselines = self._rebaseline_port.expected_baselines(
             test_filepath, suffix, True)
@@ -581 +590 @@
                 self._test_expectations.remove_platform_from_expectations(
                 self._rebaselined_tests, self._platform))
-            path = self._port.path_to_test_expectations_file()
+            path = self._target_port.path_to_test_expectations_file()
             if backup:
                 date_suffix = time.strftime('%Y%m%d%H%M%S',
@@ -798 +807 @@
     HTML_TR = '<tr>%s</tr>'
 
-    def __init__(self, port, options, platforms, rebaselining_tests):
+    def __init__(self, target_port, options, platforms, rebaselining_tests):
         self._html_directory = options.html_directory
-        self._port = port
+        self._target_port = target_port
         self._platforms = platforms
         self._rebaselining_tests = rebaselining_tests
@@ -839 +848 @@
         _log.info('Launching html: "%s"', self._html_file)
 
-        html_uri = self._port.filename_to_uri(self._html_file)
+        html_uri = self._target_port.filename_to_uri(self._html_file)
         webbrowser.open(html_uri, 1)
 
@@ -877 +886 @@
         if os.path.exists(old_file):
             links += html_td_link % {
-                'uri': self._port.filename_to_uri(old_file),
+                'uri': self._target_port.filename_to_uri(old_file),
                 'name': baseline_filename}
         else:
@@ -883 +892 @@
             links += self.HTML_TD_NOLINK % ''
 
-        links += html_td_link % {'uri': self._port.filename_to_uri(new_file),
+        links += html_td_link % {'uri': self._target_port.filename_to_uri(
+                                     new_file),
                                  'name': baseline_filename}
 
@@ -891 +901 @@
         _log.info('    Baseline diff file: "%s"', diff_file)
         if os.path.exists(diff_file):
-            links += html_td_link % {'uri': self._port.filename_to_uri(
+            links += html_td_link % {'uri': self._target_port.filename_to_uri(
                 diff_file), 'name': 'Diff'}
         else:
@@ -930 +940 @@
 
         if rows:
-            test_path = os.path.join(self._port.layout_tests_dir(), test)
-            html = self.HTML_TR_TEST % (self._port.filename_to_uri(test_path),
-                test)
+            test_path = os.path.join(self._target_port.layout_tests_dir(),
+                                     test)
+            html = self.HTML_TR_TEST % (
+                self._target_port.filename_to_uri(test_path), test)
             html += self.HTML_TEST_DETAIL % ' '.join(rows)
 
@@ -988 +999 @@
                                    ' rebaselining comparison.'))
 
+    option_parser.add_option('', '--target-platform',
+                             default='chromium',
+                             help=('The target platform to rebaseline '
+                                   '("mac", "chromium", "qt", etc.). Defaults '
+                                   'to "chromium".'))
     options = option_parser.parse_args()[0]
 
-    # FIXME: Setting options.chromium to True forces port.get() to only look
-    # at Chromium ports; we hard-code this because this script doesn't work
-    # on non-Chromium ports yet. We should fix that.
-    options.chromium = True
+    # We need to create three different Port objects over the life of this
+    # script. |target_port_obj| is used to determine configuration information:
+    # location of the expectations file, names of ports to rebaseline, etc.
+    # |port_obj| is used for runtime functionality like actually diffing
+    # Then we create a rebaselining port to actual find and manage the
+    # baselines.
+    target_options = copy.copy(options)
+    if options.target_platform == 'chromium':
+        target_options.chromium = True
+    target_port_obj = port.get(None, target_options)
 
     # Set up our logging format.
@@ -1014 +1036 @@
         port_obj = port.get(None, options)
     else:
-       _log.debug('Found release version image diff binary.')
+        _log.debug('Found release version image diff binary.')
 
     # Verify 'platforms' option is valid
@@ -1041 +1063 @@
     backup = options.backup
     for platform in rebaseline_platforms:
-        rebaseliner = Rebaseliner(port_obj, platform, options)
+        rebaseliner = Rebaseliner(port_obj, target_port_obj, platform, options)
 
         _log.info('')
@@ -1056 +1078 @@
     _log.info('')
     log_dashed_string('Rebaselining result comparison started', None)
-    html_generator = HtmlGenerator(port_obj,
+    html_generator = HtmlGenerator(target_port_obj,
                                    options,
                                    rebaseline_platforms,