Modified: trunk/Tools/ChangeLog (134362 => 134363)
--- trunk/Tools/ChangeLog 2012-11-13 06:08:03 UTC (rev 134362)
+++ trunk/Tools/ChangeLog 2012-11-13 06:12:55 UTC (rev 134363)
@@ -1,3 +1,17 @@
+2012-11-12 Dirk Pranke <[email protected]>
+
+ remove 'webkit-patch optimize-expectations'
+ https://bugs.webkit.org/show_bug.cgi?id=102032
+
+ Reviewed by Adam Barth.
+
+ Removing this command because it is totally broken (probably
+ broke when I added support for multiple files in a cascade)
+ and doesn't seem to do anything much useful. It certainly
+ didn't actually optimize things.
+
+ * Scripts/webkitpy/tool/commands/expectations.py: Removed.
+
2012-11-12 Xiaobo Wang <[email protected]>
[BlackBerry] DRT - Update Pixel Dump Support for OpenGL renderer
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py (134362 => 134363)
--- trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py 2012-11-13 06:08:03 UTC (rev 134362)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/__init__.py 2012-11-13 06:12:55 UTC (rev 134363)
@@ -8,7 +8,6 @@
from webkitpy.tool.commands.chromechannels import ChromeChannels
from webkitpy.tool.commands.download import *
from webkitpy.tool.commands.earlywarningsystem import *
-from webkitpy.tool.commands.expectations import OptimizeExpectations
from webkitpy.tool.commands.findusers import FindUsers
from webkitpy.tool.commands.gardenomatic import GardenOMatic
from webkitpy.tool.commands.openbugs import OpenBugs
Deleted: trunk/Tools/Scripts/webkitpy/tool/commands/expectations.py (134362 => 134363)
--- trunk/Tools/Scripts/webkitpy/tool/commands/expectations.py 2012-11-13 06:08:03 UTC (rev 134362)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/expectations.py 2012-11-13 06:12:55 UTC (rev 134363)
@@ -1,44 +0,0 @@
-# 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
-from webkitpy.layout_tests.models.test_expectations import TestExpectations
-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 = tool.port_factory.get("chromium-win-win7") # FIXME: This should be selectable.
- parser = TestExpectationParser(port, [], allow_rebaseline_modifier=False)
- expectation_lines = parser.parse(port.test_expectations())
- converter = TestConfigurationConverter(port.all_test_configurations(), port.configuration_specifier_macros())
- tool.filesystem.write_text_file(port.path_to_test_expectations_file(), TestExpectations.list_to_string(expectation_lines, converter))