Modified: trunk/Tools/ChangeLog (133565 => 133566)
--- trunk/Tools/ChangeLog 2012-11-06 07:18:12 UTC (rev 133565)
+++ trunk/Tools/ChangeLog 2012-11-06 07:44:18 UTC (rev 133566)
@@ -1,5 +1,20 @@
2012-11-05 Dirk Pranke <[email protected]>
+ webkit-patch rebaseline*: fix typo for --results-directory
+ https://bugs.webkit.org/show_bug.cgi?id=101295
+
+ Reviewed by Ojan Vafai.
+
+ Had --results_directory instead of --results-directory in both the
+ code and the unit test.
+
+ * Scripts/webkitpy/tool/commands/rebaseline.py:
+ (AbstractParallelRebaselineCommand._rebaseline_commands):
+ * Scripts/webkitpy/tool/commands/rebaseline_unittest.py:
+ (TestRebaselineJson.test_results_directory):
+
+2012-11-05 Dirk Pranke <[email protected]>
+
webkit-patch rebaseline*: fix handling of local file urls
https://bugs.webkit.org/show_bug.cgi?id=101296
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py (133565 => 133566)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2012-11-06 07:18:12 UTC (rev 133565)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline.py 2012-11-06 07:44:18 UTC (rev 133566)
@@ -312,7 +312,7 @@
for platform in move_overwritten_baselines_to:
cmd_line.extend(['--move-overwritten-baselines-to', platform])
if options.results_directory:
- cmd_line.extend(['--results_directory', options.results_directory])
+ cmd_line.extend(['--results-directory', options.results_directory])
if options.verbose:
cmd_line.append('--verbose')
commands.append(tuple([cmd_line, cwd]))
Modified: trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py (133565 => 133566)
--- trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2012-11-06 07:18:12 UTC (rev 133565)
+++ trunk/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py 2012-11-06 07:44:18 UTC (rev 133566)
@@ -282,7 +282,7 @@
# Note that we have only one run_in_parallel() call
self.assertEquals(self.tool.executive.calls,
- [[['echo', 'rebaseline-test-internal', '--suffixes', 'txt,png', '--builder', 'MOCK builder', '--test', 'user-scripts/another-test.html', '--results_directory', '/tmp', '--verbose']]])
+ [[['echo', 'rebaseline-test-internal', '--suffixes', 'txt,png', '--builder', 'MOCK builder', '--test', 'user-scripts/another-test.html', '--results-directory', '/tmp', '--verbose']]])
class TestRebaseline(_BaseTestCase):
