Changeset 55938 in webkit

Timestamp:

Mar 12, 2010 2:43:00 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

2010-03-12 Dirk Pranke <​dpranke@chromium.org>

Reviewed by Adam Barth.

new-run-webkit-tests --new-baseline doesn't work at all.

It attempts to call a method that isn't defined. To fix it, I
removed the unnecessary and unnecessarily confusing 'platform'
argument to the test_type constructor and use the Port object that
is passed in instead, since we are only ever generating a baseline
from the port that is currently executing.

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

• Scripts/webkitpy/layout_tests/port/mac.py:
• Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
• Scripts/webkitpy/layout_tests/run_webkit_tests.py:
• Scripts/webkitpy/layout_tests/test_types/test_type_base.py:

Location:

trunk/WebKitTools

Files:

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

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-12  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Adam Barth.
+
+        new-run-webkit-tests --new-baseline doesn't work at all.
+
+        It attempts to call a method that isn't defined. To fix it, I
+        removed the unnecessary and unnecessarily confusing 'platform'
+        argument to the test_type constructor and use the Port object that
+        is passed in instead, since we are only ever generating a baseline
+        from the port that is currently executing.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36046
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+        * Scripts/webkitpy/layout_tests/rebaseline_chromium_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+        * Scripts/webkitpy/layout_tests/test_types/test_type_base.py:
+
 2010-03-12  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -59 +59 @@
         self._cached_build_root = None
 
+    def baseline_path(self):
+        return self._webkit_baseline_path(self._name)
+
     def baseline_search_path(self):
         dirs = []

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

@@ -545 +545 @@
 
         if ext1 == '.PNG':
-            return image_diff.ImageDiff(self._port, self._platform,
-                '').diff_files(self._port, file1, file2)
+            return image_diff.ImageDiff(self._port,
+               '').diff_files(self._port, file1, file2)
         else:
-            return text_diff.TestTextDiff(self._port, self._platform,
+            return text_diff.TestTextDiff(self._port,
                 '').diff_files(self._port, file1, file2)
 

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

@@ -517 +517 @@
             test_types = []
             for t in self._test_types:
-                test_types.append(t(self._port, self._options.platform,
+                test_types.append(t(self._port,
                                     self._options.results_directory))
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/test_types/test_type_base.py

@@ -73 +73 @@
     FILENAME_SUFFIX_COMPARE = "-diff.png"
 
-    def __init__(self, port, platform, root_output_dir):
+    def __init__(self, port, root_output_dir):
         """Initialize a TestTypeBase object.
 
         Args:
-          platform: the platform (e.g., 'chromium-mac-leopard')
-            identifying the platform-specific results to be used.
+          port: object implementing port-specific information and methods
           root_output_dir: The unix style path to the output dir.
         """
         self._root_output_dir = root_output_dir
         self._port = port
-        self._platform = platform
 
     def _make_output_directory(self, filename):
@@ -93 +91 @@
 
     def _save_baseline_data(self, filename, data, modifier):
-        """Saves a new baseline file into the platform directory.
+        """Saves a new baseline file into the port's baseline directory.
 
         The file will be named simply "<test>-expected<modifier>", suitable for
@@ -105 +103 @@
         relative_dir = os.path.dirname(
             self._port.relative_test_filename(filename))
-        output_dir = os.path.join(
-            self._port.chromium_baseline_path(self._platform), relative_dir)
+
+        baseline_path = self._port.baseline_path()
+        output_dir = os.path.join(baseline_path, relative_dir)
         output_file = os.path.basename(os.path.splitext(filename)[0] +
             self.FILENAME_SUFFIX_EXPECTED + modifier)