Commit 0501f94c authored by eric@webkit.org's avatar eric@webkit.org

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:

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@90547 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 7e510d3b
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>
Remove unexpected_results.json
......
......@@ -531,16 +531,14 @@ class TestExpectations:
'or a non-numeric bug identifier.', test_list_path)
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:
self._add_error(lineno,
'REBASELINE should only be used for running rebaseline.py. '
'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,
'A test can not be both SLOW and TIMEOUT. If it times out '
......@@ -548,15 +546,14 @@ class TestExpectations:
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)
and not self._port.test_exists(test_list_path + '-disabled')):
# Log a non fatal error here since you hit this case any
# 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
......
......@@ -302,6 +302,7 @@ class WebKitPort(Port):
if not self._filesystem.exists(filename):
_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))
return tests_to_skip
......@@ -311,6 +312,7 @@ class WebKitPort(Port):
expectations = self._skipped_list_as_expectations()
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment