Changeset 56648 in webkit

Timestamp:

Mar 26, 2010 5:15:21 PM (14 years ago)

Author:

dpranke@chromium.org

Message:

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

Reviewed by Eric Seidel.

Add a test_expectations.txt file for the mac platform so
new-run-webkit-tests can track IMAGE failures.

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

• platform/mac/test_expectations.txt: Added.

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

Reviewed by Eric Seidel.

Change the Mac port of new-run-webkit-tests to look for a
test_expectations.txt file in addition to the Skipped files, so we
can track pixel failures.

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

• Scripts/webkitpy/layout_tests/port/mac.py:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/mac/test_expectations.txt (added)
• WebKitTools/ChangeLog (modified) (1 diff)
• WebKitTools/Scripts/webkitpy/layout_tests/port/mac.py (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2010-03-25  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Add a test_expectations.txt file for the mac platform so
+        new-run-webkit-tests can track IMAGE failures.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36619
+
+        * platform/mac/test_expectations.txt: Added.
+
 2010-03-26  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-03-26  Dirk Pranke  <dpranke@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Change the Mac port of new-run-webkit-tests to look for a
+        test_expectations.txt file in addition to the Skipped files, so we
+        can track pixel failures.
+
+        https://bugs.webkit.org/show_bug.cgi?id=36619
+
+        * Scripts/webkitpy/layout_tests/port/mac.py:
+
 2010-03-26  Dirk Pranke  <dpranke@chromium.org>
 

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

@@ -158 +158 @@
         return int(os.popen2("sysctl -n hw.ncpu")[1].read())
 
+    def path_to_test_expectations_file(self):
+        return self.path_from_webkit_base('LayoutTests', 'platform',
+           'mac', 'test_expectations.txt')
+
     def results_directory(self):
         return ('/tmp/run-chromium-webkit-tests-' +
@@ -240 +244 @@
 
     def test_expectations(self):
-        # The WebKit mac port uses 'Skipped' files at the moment. Each
-        # file contains a list of files or directories to be skipped during
-        # the test run. The total list of tests to skipped is given by the
-        # contents of the generic Skipped file found in platform/X plus
-        # a version-specific file found in platform/X-version. Duplicate
-        # entries are allowed. This routine reads those files and turns
-        # contents into the format expected by test_expectations.
-        tests_to_skip = set(self._expectations_from_skipped_files()) # Use a set to allow duplicates
+        # The WebKit mac port uses a combination of a test_expectations file
+        # and 'Skipped' files.
+        expectations_file = self.path_to_test_expectations_file()
+        expectations = file(expectations_file, "r").read()
+        return expectations + self._skips()
+
+    def _skips(self):
+        # Each Skipped file contains a list of files
+        # or directories to be skipped during the test run. The total list
+        # of tests to skipped is given by the contents of the generic
+        # Skipped file found in platform/X plus a version-specific file
+        # found in platform/X-version. Duplicate entries are allowed.
+        # This routine reads those files and turns contents into the
+        # format expected by test_expectations.
+
+        # Use a set to allow duplicates
+        tests_to_skip = set(self._expectations_from_skipped_files())
+
         tests_to_skip.update(self._tests_for_other_platforms())
         tests_to_skip.update(self._tests_for_disabled_features())
-        expectations = map(lambda test_path: "BUG_SKIPPED SKIP : %s = FAIL" % test_path, tests_to_skip)
-        return "\n".join(expectations)
+        skip_lines = map(lambda test_path: "BUG_SKIPPED SKIP : %s = FAIL" %
+                                test_path, tests_to_skip)
+        return "\n".join(skip_lines)
 
     def test_platform_name(self):
-        # At the moment we don't use test platform names, but we have
-        # to return something.
-        return 'mac'
+        return 'mac' + self.version()
 
     def test_platform_names(self):
-        # At the moment we don't use test platform names, but we have
-        # to return something.
-        return ('mac',)
+        return ('mac', 'mac-tiger', 'mac-leopard', 'mac-snowleopard')
 
     def version(self):