Changeset 90547 in webkit

Timestamp:

Jul 7, 2011, 12:26:52 AM (14 years ago)

Author:

eric@webkit.org

Message:

2011-07-07 Eric Seidel <​eric@webkit.org>

Unreviewed. Add more debug logging about which test expectations we're using.

• Scripts/webkitpy/layout_tests/models/test_expectations.py:
• Scripts/webkitpy/layout_tests/port/webkit.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/models/test_expectations.py (modified) (4 diffs)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-07  Eric Seidel  <eric@webkit.org>
+
+        Unreviewed.  Add more debug logging about which test expectations we're using.
+
+        * Scripts/webkitpy/layout_tests/models/test_expectations.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2011-07-06  Adam Barth  <abarth@webkit.org>
 

trunk/Tools/Scripts/webkitpy/layout_tests/models/test_expectations.py

@@ -532 +532 @@
 
         if not has_bug and not has_wontfix:
-            self._log_non_fatal_error(lineno, 'Test lacks BUG modifier.',
-                                      test_list_path)
+            self._log_non_fatal_error(lineno, 'Test lacks BUG modifier.', test_list_path)
 
         if self._is_lint_mode and 'rebaseline' in options:
@@ -540 +539 @@
                 'Cannot be checked in.', test_list_path)
 
-    def _check_options_against_expectations(self, options, expectations,
-                                            lineno, test_list_path):
+    def _check_options_against_expectations(self, options, expectations, lineno, test_list_path):
         if 'slow' in options and TIMEOUT in expectations:
             self._add_error(lineno,
@@ -549 +547 @@
     def _check_path_does_not_exist(self, lineno, test_list_path):
         # WebKit's way of skipping tests is to add a -disabled suffix.
-            # So we should consider the path existing if the path or the
+        # So we should consider the path existing if the path or the
         # -disabled version exists.
         if (not self._port.test_exists(test_list_path)
@@ -556 +554 @@
             # time you update test_expectations.txt without syncing
             # the LayoutTests directory
-            self._log_non_fatal_error(lineno, 'Path does not exist.',
-                                      test_list_path)
+            self._log_non_fatal_error(lineno, 'Path does not exist.', test_list_path)
             return True
         return False

trunk/Tools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -303 +303 @@
                 _log.warn("Failed to open Skipped file: %s" % filename)
                 continue
+            _log.debug("Using Skipped file: %s" % filename)
             skipped_file_contents = self._filesystem.read_text_file(filename)
             tests_to_skip.extend(self._tests_from_skipped_file_contents(skipped_file_contents))
@@ -312 +313 @@
         expectations_path = self.path_to_test_expectations_file()
         if self._filesystem.exists(expectations_path):
+            _log.debug("Using test_expectations.txt: %s" % expectations_path)
             expectations = self._filesystem.read_text_file(expectations_path) + expectations
         return expectations