Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1777)

Unified Diff: Tools/Scripts/webkitpy/tool/commands/rebaseline.py

Issue 23135008: Modify the rebaselining logic to handle skipped tests. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Tools/Scripts/webkitpy/tool/commands/rebaseline.py
diff --git a/Tools/Scripts/webkitpy/tool/commands/rebaseline.py b/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
index ec55decae82534757e3b4108ee5b634248206b8f..f707bcca7b60add59de36dabf698140390ef6d63 100644
--- a/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
+++ b/Tools/Scripts/webkitpy/tool/commands/rebaseline.py
@@ -41,7 +41,7 @@ from webkitpy.common.memoized import memoized
from webkitpy.common.system.executive import ScriptError
from webkitpy.layout_tests.controllers.test_result_writer import TestResultWriter
from webkitpy.layout_tests.models import test_failures
-from webkitpy.layout_tests.models.test_expectations import TestExpectations, BASELINE_SUFFIX_LIST
+from webkitpy.layout_tests.models.test_expectations import TestExpectations, BASELINE_SUFFIX_LIST, SKIP
from webkitpy.layout_tests.port import builders
from webkitpy.layout_tests.port import factory
from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
@@ -152,6 +152,11 @@ class CopyExistingBaselinesInternal(BaseInternalRebaselineCommand):
_log.debug("Existing baseline at %s, not copying over it." % new_baseline)
continue
+ expectations = TestExpectations(port, [test_name])
+ if SKIP in expectations.get_expectations(test_name):
Dirk Pranke 2013/08/19 05:40:52 Ojan, do I need any other expectations in here (in
ojan 2013/08/19 06:05:27 If it's WontFix, we artificially add Skip at the m
+ _log.debug("%s is skipped on %s." % (test_name, port.name()))
+ continue
+
old_baselines.append(old_baseline)
new_baselines.append(new_baseline)
« no previous file with comments | « no previous file | Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698