Modified: trunk/Tools/ChangeLog (92323 => 92324)
--- trunk/Tools/ChangeLog 2011-08-03 23:01:45 UTC (rev 92323)
+++ trunk/Tools/ChangeLog 2011-08-03 23:03:32 UTC (rev 92324)
@@ -1,5 +1,17 @@
2011-08-03 Dimitri Glazkov <[email protected]>
+ Add "optimize-expectations" command to webkit-patch.
+ https://bugs.webkit.org/show_bug.cgi?id=65633
+
+ For now, only operates on Chromium test_expectations.txt and does not report errors/warnings.
+
+ Reviewed by Adam Barth.
+
+ * Scripts/webkitpy/tool/commands/__init__.py: Added command.
+ * Scripts/webkitpy/tool/commands/expectations.py: Added.
+
+2011-08-03 Dimitri Glazkov <[email protected]>
+
Allow multiple bug identifiers in test expectations.
https://bugs.webkit.org/show_bug.cgi?id=65642
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py (92323 => 92324)
--- trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py 2011-08-03 23:01:45 UTC (rev 92323)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py 2011-08-03 23:03:32 UTC (rev 92324)
@@ -4,6 +4,7 @@
from webkitpy.tool.commands.bugsearch import BugSearch
from webkitpy.tool.commands.download import *
from webkitpy.tool.commands.earlywarningsystem import *
+from webkitpy.tool.commands.expectations import OptimizeExpectations
from webkitpy.tool.commands.gardenomatic import GardenOMatic
from webkitpy.tool.commands.openbugs import OpenBugs
from webkitpy.tool.commands.prettydiff import PrettyDiff
Added: trunk/Tools/Scripts/webkitpy/tool/commands/expectations.py (0 => 92324)
--- trunk/Tools/Scripts/webkitpy/tool/commands/expectations.py (rev 0)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/expectations.py 2011-08-03 23:03:32 UTC (rev 92324)
@@ -0,0 +1,46 @@
+# Copyright (c) 2011 Google Inc. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are
+# met:
+#
+# * Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# * Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following disclaimer
+# in the documentation and/or other materials provided with the
+# distribution.
+# * Neither the name of Google Inc. nor the names of its
+# contributors may be used to endorse or promote products derived from
+# this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+from webkitpy.layout_tests.models.test_configuration import TestConfigurationConverter
+from webkitpy.layout_tests.models.test_expectations import TestExpectationParser, TestExpectationSerializer
+from webkitpy.layout_tests.port import factory
+from webkitpy.tool.multicommandtool import AbstractDeclarativeCommand
+
+
+class OptimizeExpectations(AbstractDeclarativeCommand):
+ name = "optimize-expectations"
+ help_text = "Fixes simple style issues in test_expectations file. (Currently works only for chromium port.)"
+
+ def execute(self, options, args, tool):
+ port = factory.get("chromium-win-win7") # FIXME: This should be selectable.
+ expectation_lines = TestExpectationParser.tokenize_list(port.test_expectations())
+ parser = TestExpectationParser(port, port.tests(["."]), allow_rebaseline_modifier=False)
+ for expectation_line in expectation_lines:
+ parser.parse(expectation_line)
+ converter = TestConfigurationConverter(port.all_test_configurations(), port.configuration_specifier_macros())
+ tool.filesystem.write_text_file(port.path_to_test_expectations_file(), TestExpectationSerializer.list_to_string(expectation_lines, converter))
