diff options
| author | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 23:06:59 +0000 |
|---|---|---|
| committer | ojan@chromium.org <ojan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-08 23:06:59 +0000 |
| commit | 681d3b6b072e17a5de40be8794550f781bf28d87 (patch) | |
| tree | 204b250e5056f2d438bf2746fb292da5b68eb1f5 /webkit | |
| parent | dc6365fe90434739578201721fa560a0e4274841 (diff) | |
| download | chromium_src-681d3b6b072e17a5de40be8794550f781bf28d87.zip chromium_src-681d3b6b072e17a5de40be8794550f781bf28d87.tar.gz chromium_src-681d3b6b072e17a5de40be8794550f781bf28d87.tar.bz2 | |
Fix rebaseline tool that I just broke by testing properly for
linting mode. TBR to fix tool
TBR=victorw
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28474 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/layout_package/test_expectations.py | 10 | ||||
| -rw-r--r-- | webkit/tools/layout_tests/rebaseline.py | 1 | ||||
| -rwxr-xr-x | webkit/tools/layout_tests/run_webkit_tests.py | 3 |
3 files changed, 9 insertions, 5 deletions
diff --git a/webkit/tools/layout_tests/layout_package/test_expectations.py b/webkit/tools/layout_tests/layout_package/test_expectations.py index 5f98d8d..4d47039 100644 --- a/webkit/tools/layout_tests/layout_package/test_expectations.py +++ b/webkit/tools/layout_tests/layout_package/test_expectations.py @@ -27,11 +27,11 @@ import simplejson class TestExpectations: TEST_LIST = "test_expectations.txt" - def __init__(self, tests, directory, platform, is_debug_mode): + def __init__(self, tests, directory, platform, is_debug_mode, is_lint_mode): """Reads the test expectations files from the given directory.""" path = os.path.join(directory, self.TEST_LIST) self._expected_failures = TestExpectationsFile(path, tests, platform, - is_debug_mode) + is_debug_mode, is_lint_mode) # TODO(ojan): Allow for removing skipped tests when getting the list of tests # to run, but not when getting metrics. @@ -223,7 +223,8 @@ class TestExpectationsFile: 'rebaseline': REBASELINE, 'none': NONE } - def __init__(self, path, full_test_list, platform, is_debug_mode): + def __init__(self, path, full_test_list, platform, is_debug_mode, + is_lint_mode): """ path: The path to the expectation file. An error is thrown if a test is listed more than once. @@ -231,10 +232,11 @@ class TestExpectationsFile: expections for those tests. platform: Which platform from self.PLATFORMS to filter tests for. is_debug_mode: Whether we testing a test_shell built debug mode. + is_lint_mode: Whether this is just linting test_expecatations.txt. """ self._path = path - self._is_lint_mode = full_test_list is None + self._is_lint_mode = is_lint_mode self._full_test_list = full_test_list self._errors = [] self._non_fatal_errors = [] diff --git a/webkit/tools/layout_tests/rebaseline.py b/webkit/tools/layout_tests/rebaseline.py index 9283010..a7dabb3 100644 --- a/webkit/tools/layout_tests/rebaseline.py +++ b/webkit/tools/layout_tests/rebaseline.py @@ -169,6 +169,7 @@ class Rebaseliner(object): self._test_expectations = test_expectations.TestExpectations(None, self._file_dir, platform, + False, False) def Run(self, backup): diff --git a/webkit/tools/layout_tests/run_webkit_tests.py b/webkit/tools/layout_tests/run_webkit_tests.py index 0df9d21..e49e565 100755 --- a/webkit/tools/layout_tests/run_webkit_tests.py +++ b/webkit/tools/layout_tests/run_webkit_tests.py @@ -164,7 +164,8 @@ class TestRunner: try: self._expectations = test_expectations.TestExpectations(test_files, - self._file_dir, platform, is_debug_mode) + self._file_dir, platform, is_debug_mode, + self._options.lint_test_files) return self._expectations except Exception, err: if self._options.lint_test_files: |