Modified: trunk/Tools/ChangeLog (129713 => 129714)
--- trunk/Tools/ChangeLog 2012-09-27 00:04:48 UTC (rev 129713)
+++ trunk/Tools/ChangeLog 2012-09-27 00:09:21 UTC (rev 129714)
@@ -1,3 +1,31 @@
+2012-09-26 Dirk Pranke <dpra...@chromium.org>
+
+ The style bot spams about skia_test_expectations.txt
+ https://bugs.webkit.org/show_bug.cgi?id=97699
+
+ Reviewed by Adam Barth.
+
+ Remove the warning about a missing skia_test_expectations.txt
+ file for now. There are some situations where it would be
+ helpful to get this warning as it might indicate that the user
+ is going to get results different than what they're expecting,
+ but at the moment it looks difficult if not impossible to get
+ those warnings and not also get warnings that we don't care
+ about, so the noise is outweighing the value of the signal.
+
+ This at least will stop the false negatives we're getting on the
+ style bots. If it turns out people do need the warning we can
+ add it back in in some other more conditional way.
+
+ * Scripts/webkitpy/layout_tests/port/chromium.py:
+ (ChromiumPort.expectations_files):
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ (TestRebaseline.test_rebaseline_updates_expectations_file_noop):
+ (test_rebaseline_updates_expectations_file):
+ (test_rebaseline_does_not_include_overrides):
+ (test_rebaseline_expectations):
+ (_assert_command):
+
2012-09-26 David Michael Barr <davidb...@chromium.org>
Unreviewed. Upgrade myself from contributor to committer.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py (129713 => 129714)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-09-27 00:04:48 UTC (rev 129713)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/chromium.py 2012-09-27 00:09:21 UTC (rev 129714)
@@ -335,10 +335,10 @@
def expectations_files(self):
paths = [self.path_to_test_expectations_file()]
skia_expectations_path = self.path_from_chromium_base('skia', 'skia_test_expectations.txt')
+ # FIXME: we should probably warn if this file is missing in some situations.
+ # See the discussion in webkit.org/b/97699.
if self._filesystem.exists(skia_expectations_path):
paths.append(skia_expectations_path)
- else:
- _log.warning("Using the chromium port without having the downstream skia_test_expectations.txt file checked out. Expectations related things might be wonky.")
builder_name = self.get_option('builder_name', 'DUMMY_BUILDER_NAME')
if builder_name == 'DUMMY_BUILDER_NAME' or '(deps)' in builder_name or builder_name in self.try_builder_names:
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (129713 => 129714)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2012-09-27 00:04:48 UTC (rev 129713)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2012-09-27 00:09:21 UTC (rev 129714)
@@ -63,8 +63,6 @@
command.bind_to_tool(tool)
lion_port = tool.port_factory.get_from_builder_name("Webkit Mac10.7")
- # FIXME: work around the chromium skia expectations file to avoid getting a bunch of confusing warnings.
- tool.filesystem.write_text_file(lion_port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), '')
for path in lion_port.expectations_files():
tool.filesystem.write_text_file(path, '')
tool.filesystem.write_text_file(lion_port.path_to_test_expectations_file(), """Bug(B) [ Mac Linux XP Debug ] fast/dom/Window/window-postmessage-clone-really-deep-array.html [ Pass ]
@@ -91,7 +89,6 @@
command.bind_to_tool(tool)
lion_port = tool.port_factory.get_from_builder_name("Webkit Mac10.7")
- tool.filesystem.write_text_file(lion_port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), '')
tool.filesystem.write_text_file(lion_port.path_to_test_expectations_file(), "Bug(x) [ Mac ] userscripts/another-test.html [ ImageOnlyFailure ]\nbug(z) [ Linux ] userscripts/another-test.html [ ImageOnlyFailure ]\n")
tool.filesystem.write_text_file(os.path.join(lion_port.layout_tests_dir(), "userscripts/another-test.html"), "Dummy test contents")
@@ -110,7 +107,6 @@
command.bind_to_tool(tool)
lion_port = tool.port_factory.get_from_builder_name("Webkit Mac10.7")
- tool.filesystem.write_text_file(lion_port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), '')
tool.filesystem.write_text_file(lion_port.path_to_test_expectations_file(), "Bug(x) [ Mac ] userscripts/another-test.html [ ImageOnlyFailure ]\nBug(z) [ Linux ] userscripts/another-test.html [ ImageOnlyFailure ]\n")
tool.filesystem.write_text_file(lion_port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), "Bug(y) [ Mac ] other-test.html [ Failure ]\n")
tool.filesystem.write_text_file(os.path.join(lion_port.layout_tests_dir(), "userscripts/another-test.html"), "Dummy test contents")
@@ -228,9 +224,7 @@
tool = MockTool()
command.bind_to_tool(tool)
- # FIXME: work around the chromium skia expectations file to avoid getting a bunch of confusing warnings.
lion_port = tool.port_factory.get_from_builder_name("Webkit Mac10.7")
- tool.filesystem.write_text_file(lion_port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), '')
for port_name in tool.port_factory.all_port_names():
port = tool.port_factory.get(port_name)
for path in port.expectations_files():
@@ -321,7 +315,6 @@
command.bind_to_tool(tool)
port = tool.port_factory.get('chromium-mac-lion')
- tool.filesystem.write_text_file(port.path_from_chromium_base('skia', 'skia_test_expectations.txt'), '')
for port_name in tool.port_factory.all_port_names():
port = tool.port_factory.get(port_name)
