Changeset 120454 in webkit

Timestamp:

Jun 15, 2012, 7:22:13 AM (14 years ago)

Author:

dpranke@chromium.org

Message:

webkit-patch rebaseline-expectations should only rebaseline the appropriate suffixes for the failure in question
​https://bugs.webkit.org/show_bug.cgi?id=88581

Reviewed by Adam Barth.

Make sure we only optimize the suffixes we rebaselined during
rebaseline-expectations, and not all suffixes for a test.
While optimizing is somewhere between harmless and good, it's also confusing :)

• Scripts/webkitpy/tool/commands/rebaseline.py:

(RebaselineExpectations._rebaseline_port):
(RebaselineExpectations.execute):

• Scripts/webkitpy/tool/commands/rebaseline_unittest.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/tool/commands/rebaseline.py (modified) (3 diffs)
• Scripts/webkitpy/tool/commands/rebaseline_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-06-15  Dirk Pranke  <dpranke@chromium.org>
+
+        webkit-patch rebaseline-expectations should only rebaseline the appropriate suffixes for the failure in question
+        https://bugs.webkit.org/show_bug.cgi?id=88581
+
+        Reviewed by Adam Barth.
+
+        Make sure we only optimize the suffixes we rebaselined during
+        rebaseline-expectations, and not all suffixes for a test.
+        While optimizing is somewhere between harmless and good, it's also confusing :)
+
+        * Scripts/webkitpy/tool/commands/rebaseline.py:
+        (RebaselineExpectations._rebaseline_port):
+        (RebaselineExpectations.execute):
+        * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+
 2012-06-15  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

@@ -285 +285 @@
         _log.info("Retrieving results for %s from %s." % (port_name, builder_name))
         for test_name, suffixes in self._tests_to_rebaseline(self._tool.port_factory.get(port_name)).iteritems():
-            self._touched_test_names.add(test_name)
+            self._touched_tests.setdefault(test_name, set()).update(set(suffixes))
             _log.info("    %s (%s)" % (test_name, ','.join(suffixes)))
             # FIXME: we should use executive.run_in_parallel() to speed this up.
@@ -291 +291 @@
 
     def execute(self, options, args, tool):
-        self._touched_test_names = set([])
+        self._touched_tests = {}
         for port_name in tool.port_factory.all_port_names():
             self._rebaseline_port(port_name)
@@ -298 +298 @@
         if not options.optimize:
             return
-        for test_name in self._touched_test_names:
-            _log.info("Optimizing baselines for %s." % test_name)
-            self._run_webkit_patch(['optimize-baselines', test_name])
+        for test_name, suffixes in self._touched_tests.iteritems():
+            _log.info("Optimizing baselines for %s (%s)." % (test_name, ','.join(suffixes)))
+            self._run_webkit_patch(['optimize-baselines', '--suffixes', ','.join(suffixes), test_name])
 
 

trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py

@@ -238 +238 @@
 
         expected_logs_with_optimize = expected_logs + (
-            "Optimizing baselines for userscripts/another-test.html.\n"
-            "Optimizing baselines for userscripts/images.svg.\n")
+            "Optimizing baselines for userscripts/another-test.html (txt).\n"
+            "Optimizing baselines for userscripts/images.svg (png).\n")
         expected_stderr_with_optimize = expected_stderr + (
-            "MOCK run_command: ['echo', 'optimize-baselines', 'userscripts/another-test.html'], cwd=/mock-checkout\n"
-            "MOCK run_command: ['echo', 'optimize-baselines', 'userscripts/images.svg'], cwd=/mock-checkout\n")
+            "MOCK run_command: ['echo', 'optimize-baselines', '--suffixes', 'txt', 'userscripts/another-test.html'], cwd=/mock-checkout\n"
+            "MOCK run_command: ['echo', 'optimize-baselines', '--suffixes', 'png', 'userscripts/images.svg'], cwd=/mock-checkout\n")
 
         command._tests_to_rebaseline = lambda port: {'userscripts/another-test.html': set(['txt']), 'userscripts/images.svg': set(['png'])}