<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[181108] branches/safari-600.4-branch/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/181108">181108</a></dd>
<dt>Author</dt> <dd>cdumez@apple.com</dd>
<dt>Date</dt> <dd>2015-03-05 15:53:37 -0800 (Thu, 05 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/181093">r181093</a> to fix layout testing on bots
2015-03-05 Chris Dumez <cdumez@apple.com>
run-webkit-tests and run-perf-tests should use WebKitTestRunner by default
https://bugs.webkit.org/show_bug.cgi?id=142325
Reviewed by Csaba Osztrogonác.
run-webkit-tests and run-perf-tests now use WebKitTestRunner by default.
As a result, "--webkit-test-runner / -2" parameters are replaced by
"--dump-render-tree / -1" so developers can run DumpRenderTree rather
than WebKitTestRunner.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6004branchToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson">branches/safari-600.4-branch/Tools/BuildSlaveSupport/build.webkit.org-config/config.json</a></li>
<li><a href="#branchessafari6004branchToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg">branches/safari-600.4-branch/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg</a></li>
<li><a href="#branchessafari6004branchToolsChangeLog">branches/safari-600.4-branch/Tools/ChangeLog</a></li>
<li><a href="#branchessafari6004branchToolsScriptswebkitpycommonconfigportspy">branches/safari-600.4-branch/Tools/Scripts/webkitpy/common/config/ports.py</a></li>
<li><a href="#branchessafari6004branchToolsScriptswebkitpycommonconfigports_unittestpy">branches/safari-600.4-branch/Tools/Scripts/webkitpy/common/config/ports_unittest.py</a></li>
<li><a href="#branchessafari6004branchToolsScriptswebkitpylayout_testsrun_webkit_testspy">branches/safari-600.4-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py</a></li>
<li><a href="#branchessafari6004branchToolsScriptswebkitpylayout_testsrun_webkit_tests_integrationtestpy">branches/safari-600.4-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py</a></li>
<li><a href="#branchessafari6004branchToolsScriptswebkitpyperformance_testsperftestsrunnerpy">branches/safari-600.4-branch/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py</a></li>
<li><a href="#branchessafari6004branchToolsScriptswebkitpyportport_testcasepy">branches/safari-600.4-branch/Tools/Scripts/webkitpy/port/port_testcase.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6004branchToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> "slavenames": ["apple-windows-2"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "Apple Win 7 Release (Tests)", "type": "Test", "builddir": "win-release-tests",
</del><ins>+ "name": "Apple Win 7 Release (Tests)", "type": "TestWebKit1", "builddir": "win-release-tests",
</ins><span class="cx"> "platform": "win", "configuration": "release", "architectures": ["i386"],
</span><span class="cx"> "slavenames": ["apple-windows-5", "apple-windows-6"]
</span><span class="cx"> },
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> "slavenames": ["apple-windows-1"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "Apple Win 7 Debug (Tests)", "type": "Test", "builddir": "win-debug-tests",
</del><ins>+ "name": "Apple Win 7 Debug (Tests)", "type": "TestWebKit1", "builddir": "win-debug-tests",
</ins><span class="cx"> "platform": "win", "configuration": "debug", "architectures": ["i386"],
</span><span class="cx"> "slavenames": ["apple-windows-3", "apple-windows-4"]
</span><span class="cx"> },
</span><span class="lines">@@ -185,7 +185,7 @@
</span><span class="cx"> "slavenames": ["gtk-linux-slave-5"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTestWebKit2", "builddir": "gtk-linux-64-release-perf-tests",
</del><ins>+ "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "gtk-linux-64-release-perf-tests",
</ins><span class="cx"> "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["gtk-linux-slave-8"]
</span><span class="cx"> },
</span><span class="lines">@@ -212,7 +212,7 @@
</span><span class="cx"> "slavenames": ["efl-linux-szeged-slave-2"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><del>- "name": "EFL Linux 64-bit Release WK2 (Perf)", "type": "BuildAndPerfTestWebKit2", "builddir": "efl-linux-64-release-wk2-perf",
</del><ins>+ "name": "EFL Linux 64-bit Release WK2 (Perf)", "type": "BuildAndPerfTest", "builddir": "efl-linux-64-release-wk2-perf",
</ins><span class="cx"> "platform": "efl", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "SVNMirror": "svn://webkit.inf.u-szeged.hu/webkit/",
</span><span class="cx"> "slavenames": ["efl-linux-szeged-slave-3"]
</span></span></pre></div>
<a id="branchessafari6004branchToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -731,12 +731,6 @@
</span><span class="cx"> return [self.name]
</span><span class="cx">
</span><span class="cx">
</span><del>-class RunAndUploadPerfTestsWebKit2(RunAndUploadPerfTests):
- def start(self):
- self.setCommand(self.command + ["--webkit-test-runner"])
- return RunAndUploadPerfTests.start(self)
-
-
</del><span class="cx"> class ArchiveTestResults(shell.ShellCommand):
</span><span class="cx"> command = ["python", "./Tools/BuildSlaveSupport/test-result-archive",
</span><span class="cx"> WithProperties("--platform=%(platform)s"), WithProperties("--%(configuration)s"), "archive"]
</span><span class="lines">@@ -920,12 +914,6 @@
</span><span class="cx"> self.addStep(CompileWebKit())
</span><span class="cx"> self.addStep(RunAndUploadPerfTests())
</span><span class="cx">
</span><del>-class BuildAndPerfTestWebKit2Factory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
- self.addStep(CompileWebKit())
- self.addStep(RunAndUploadPerfTestsWebKit2())
-
</del><span class="cx"> class DownloadAndPerfTestFactory(Factory):
</span><span class="cx"> def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
</span><span class="cx"> Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
</span><span class="lines">@@ -933,13 +921,6 @@
</span><span class="cx"> self.addStep(ExtractBuiltProduct())
</span><span class="cx"> self.addStep(RunAndUploadPerfTests())
</span><span class="cx">
</span><del>-class DownloadAndPerfTestWebKit2Factory(Factory):
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
- self.addStep(DownloadBuiltProduct())
- self.addStep(ExtractBuiltProduct())
- self.addStep(RunAndUploadPerfTestsWebKit2())
-
</del><span class="cx"> class PlatformSpecificScheduler(AnyBranchScheduler):
</span><span class="cx"> def __init__(self, platform, branch, **kwargs):
</span><span class="cx"> self.platform = platform
</span></span></pre></div>
<a id="branchessafari6004branchToolsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/ChangeLog (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/ChangeLog 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/ChangeLog 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -1,3 +1,58 @@
</span><ins>+2015-03-05 Chris Dumez <cdumez@apple.com>
+
+ run-webkit-tests and run-perf-tests should use WebKitTestRunner by default
+ https://bugs.webkit.org/show_bug.cgi?id=142325
+
+ Reviewed by Csaba Osztrogonác.
+
+ run-webkit-tests and run-perf-tests now use WebKitTestRunner by default.
+ As a result, "--webkit-test-runner / -2" parameters are replaced by
+ "--dump-render-tree / -1" so developers can run DumpRenderTree rather
+ than WebKitTestRunner.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunWebKit1Tests):
+ (RunWebKit1Tests.start):
+ (RunWebKit1LeakTests):
+ (RunWebKit1LeakTests.start):
+ (RunAndUploadPerfTestsWebKit1):
+ (RunAndUploadPerfTestsWebKit1.start):
+ (TestFactory):
+ (TestWebKit1LeaksFactory):
+ (TestWebKit1LeaksFactory.__init__):
+ (TestWebKit1Factory):
+ (TestWebKit1AllButJSCFactory):
+ (TestAllButJSCFactory):
+ (BuildAndPerfTestWebKit1Factory):
+ (BuildAndPerfTestWebKit1Factory.__init__):
+ (BuildAndPerfTestFactory):
+ (BuildAndPerfTestFactory.__init__):
+ (DownloadAndPerfTestWebKit1Factory):
+ (DownloadAndPerfTestWebKit1Factory.__init__):
+ (DownloadAndPerfTestFactory):
+ (DownloadAndPerfTestFactory.__init__):
+ (RunWebKitLeakTests): Deleted.
+ (RunWebKitLeakTests.start): Deleted.
+ (RunWebKit2Tests): Deleted.
+ (RunWebKit2Tests.start): Deleted.
+ (RunAndUploadPerfTestsWebKit2): Deleted.
+ (RunAndUploadPerfTestsWebKit2.start): Deleted.
+ (TestLeaksFactory): Deleted.
+ (TestLeaksFactory.__init__): Deleted.
+ (TestWebKit2Factory): Deleted.
+ (TestWebKit2AndJSCFactory): Deleted.
+ (BuildAndPerfTestWebKit2Factory): Deleted.
+ (BuildAndPerfTestWebKit2Factory.__init__): Deleted.
+ (DownloadAndPerfTestWebKit2Factory): Deleted.
+ (DownloadAndPerfTestWebKit2Factory.__init__): Deleted.
+ * Scripts/webkitpy/layout_tests/run_webkit_tests.py:
+ (parse_args):
+ * Scripts/webkitpy/performance_tests/perftestsrunner.py:
+ (PerfTestsRunner._parse_args):
+ * Scripts/webkitpy/port/port_testcase.py:
+ (PortTestCase.test_build_driver):
+
</ins><span class="cx"> 2015-01-20 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Rollout r178679. rdar://problem/19448129
</span></span></pre></div>
<a id="branchessafari6004branchToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/Scripts/webkitpy/common/config/ports.py (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/Scripts/webkitpy/common/config/ports.py 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/Scripts/webkitpy/common/config/ports.py 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -121,23 +121,27 @@
</span><span class="cx"> class MacPort(DeprecatedPort):
</span><span class="cx"> port_flag_name = "mac"
</span><span class="cx">
</span><ins>+ def run_webkit_tests_command(self):
+ command = super(MacPort, self).run_webkit_tests_command()
+ command.append("--dump-render-tree")
+ return command
</ins><span class="cx">
</span><span class="cx"> class MacWK2Port(DeprecatedPort):
</span><span class="cx"> port_flag_name = "mac-wk2"
</span><span class="cx">
</span><del>- def run_webkit_tests_command(self):
- command = super(MacWK2Port, self).run_webkit_tests_command()
- command.append("-2")
- return command
</del><span class="cx">
</span><del>-
</del><span class="cx"> class WinPort(DeprecatedPort):
</span><span class="cx"> port_flag_name = "win"
</span><span class="cx">
</span><span class="cx"> def run_bindings_tests_command(self):
</span><span class="cx"> return None
</span><span class="cx">
</span><ins>+ def run_webkit_tests_command(self):
+ command = super(WinPort, self).run_webkit_tests_command()
+ command.append("--dump-render-tree")
+ return command
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class GtkWK2Port(DeprecatedPort):
</span><span class="cx"> port_flag_name = "gtk-wk2"
</span><span class="cx">
</span><span class="lines">@@ -152,7 +156,6 @@
</span><span class="cx"> def run_webkit_tests_command(self):
</span><span class="cx"> command = super(GtkWK2Port, self).run_webkit_tests_command()
</span><span class="cx"> command.append("--gtk")
</span><del>- command.append("-2")
</del><span class="cx"> return command
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6004branchToolsScriptswebkitpycommonconfigports_unittestpy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/Scripts/webkitpy/common/config/ports_unittest.py (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/Scripts/webkitpy/common/config/ports_unittest.py 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -34,13 +34,13 @@
</span><span class="cx"> class DeprecatedPortTest(unittest.TestCase):
</span><span class="cx"> def test_mac_port(self):
</span><span class="cx"> self.assertEqual(MacPort().flag(), "--port=mac")
</span><del>- self.assertEqual(MacPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests"))
</del><ins>+ self.assertEqual(MacPort().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--dump-render-tree"])
</ins><span class="cx"> self.assertEqual(MacPort().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit"))
</span><span class="cx"> self.assertEqual(MacPort().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug"])
</span><span class="cx"> self.assertEqual(MacPort().build_webkit_command(build_style="release"), DeprecatedPort().script_shell_command("build-webkit") + ["--release"])
</span><span class="cx">
</span><span class="cx"> def test_gtk_wk2_port(self):
</span><span class="cx"> self.assertEqual(GtkWK2Port().flag(), "--port=gtk-wk2")
</span><del>- self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk", "-2"])
</del><ins>+ self.assertEqual(GtkWK2Port().run_webkit_tests_command(), DeprecatedPort().script_shell_command("run-webkit-tests") + ["--gtk"])
</ins><span class="cx"> self.assertEqual(GtkWK2Port().build_webkit_command(), DeprecatedPort().script_shell_command("build-webkit") + ["--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
</span><span class="cx"> self.assertEqual(GtkWK2Port().build_webkit_command(build_style="debug"), DeprecatedPort().script_shell_command("build-webkit") + ["--debug", "--gtk", "--update-gtk", "--no-webkit1", DeprecatedPort().makeArgs()])
</span></span></pre></div>
<a id="branchessafari6004branchToolsScriptswebkitpylayout_testsrun_webkit_testspy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests.py 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -122,8 +122,8 @@
</span><span class="cx"> help="Enable Guard Malloc (OS X only)"),
</span><span class="cx"> optparse.make_option("--threaded", action="store_true", default=False,
</span><span class="cx"> help="Run a concurrent JavaScript thread with each test"),
</span><del>- optparse.make_option("--webkit-test-runner", "-2", action="store_true",
- help="Use WebKitTestRunner rather than DumpRenderTree."),
</del><ins>+ optparse.make_option("--dump-render-tree", "-1", action="store_false", default=True, dest="webkit_test_runner",
+ help="Use DumpRenderTree rather than WebKitTestRunner."),
</ins><span class="cx"> # FIXME: We should merge this w/ --build-directory and only have one flag.
</span><span class="cx"> optparse.make_option("--root", action="store",
</span><span class="cx"> help="Path to a directory containing the executables needed to run tests."),
</span></span></pre></div>
<a id="branchessafari6004branchToolsScriptswebkitpylayout_testsrun_webkit_tests_integrationtestpy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_integrationtest.py 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -552,7 +552,7 @@
</span><span class="cx"> mock_crash_report = make_mock_crash_report_darwin('DumpRenderTree', 12345)
</span><span class="cx"> host = MockHost()
</span><span class="cx"> host.filesystem.write_text_file('/Users/mock/Library/Logs/DiagnosticReports/DumpRenderTree_2011-06-13-150719_quadzen.crash', mock_crash_report)
</span><del>- _, regular_output, _ = logging_run(['failures/unexpected/crash-with-stderr.html'], tests_included=True, host=host)
</del><ins>+ _, regular_output, _ = logging_run(['failures/unexpected/crash-with-stderr.html', '--dump-render-tree'], tests_included=True, host=host)
</ins><span class="cx"> expected_crash_log = mock_crash_report
</span><span class="cx"> self.assertEqual(host.filesystem.read_text_file('/tmp/layout-test-results/failures/unexpected/crash-with-stderr-crash-log.txt'), expected_crash_log)
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari6004branchToolsScriptswebkitpyperformance_testsperftestsrunnerpy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/Scripts/webkitpy/performance_tests/perftestsrunner.py 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -115,8 +115,8 @@
</span><span class="cx"> help="Don't launch a browser with results after the tests are done"),
</span><span class="cx"> optparse.make_option("--test-results-server",
</span><span class="cx"> help="Upload the generated JSON file to the specified server when --output-json-path is present."),
</span><del>- optparse.make_option("--webkit-test-runner", "-2", action="store_true",
- help="Use WebKitTestRunner rather than DumpRenderTree."),
</del><ins>+ optparse.make_option("--dump-render-tree", "-1", action="store_false", default=True, dest="webkit_test_runner",
+ help="Use DumpRenderTree rather than WebKitTestRunner."),
</ins><span class="cx"> optparse.make_option("--force", dest="use_skipped_list", action="store_false", default=True,
</span><span class="cx"> help="Run all tests, including the ones in the Skipped list."),
</span><span class="cx"> optparse.make_option("--profile", action="store_true",
</span></span></pre></div>
<a id="branchessafari6004branchToolsScriptswebkitpyportport_testcasepy"></a>
<div class="modfile"><h4>Modified: branches/safari-600.4-branch/Tools/Scripts/webkitpy/port/port_testcase.py (181107 => 181108)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-600.4-branch/Tools/Scripts/webkitpy/port/port_testcase.py 2015-03-05 23:47:21 UTC (rev 181107)
+++ branches/safari-600.4-branch/Tools/Scripts/webkitpy/port/port_testcase.py 2015-03-05 23:53:37 UTC (rev 181108)
</span><span class="lines">@@ -507,7 +507,7 @@
</span><span class="cx"> expected_logs = "MOCK run_command: ['Tools/Scripts/build-dumprendertree', '--release'], cwd=/mock-checkout, env={'LC_ALL': 'C', 'MOCK_ENVIRON_COPY': '1'}\n"
</span><span class="cx"> self.assertTrue(output.assert_outputs(self, port._build_driver, expected_logs=expected_logs))
</span><span class="cx">
</span><del>- # Make sure when passed --webkit-test-runner we build the right tool.
</del><ins>+ # Make sure WebKitTestRunner is used.
</ins><span class="cx"> port._options = MockOptions(webkit_test_runner=True, configuration="Release")
</span><span class="cx"> expected_logs = "MOCK run_command: ['Tools/Scripts/build-dumprendertree', '--release'], cwd=/mock-checkout, env={'LC_ALL': 'C', 'MOCK_ENVIRON_COPY': '1'}\nMOCK run_command: ['Tools/Scripts/build-webkittestrunner', '--release'], cwd=/mock-checkout, env={'LC_ALL': 'C', 'MOCK_ENVIRON_COPY': '1'}\n"
</span><span class="cx"> self.assertTrue(output.assert_outputs(self, port._build_driver, expected_logs=expected_logs))
</span></span></pre>
</div>
</div>
</body>
</html>