<!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>[214377] trunk/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/214377">214377</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-24 14:23:59 -0700 (Fri, 24 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>webkitpy should be able to run API tests
https://bugs.webkit.org/show_bug.cgi?id=170028
Patch by Srinivasan Vijayaraghavan <svijayaraghavan@apple.com> on 2017-03-24
Reviewed by Alexey Proskuryakov.
* Scripts/webkitpy/common/config/ports.py:
(DeprecatedPort.run_api_tests_command): Added.
* Scripts/webkitpy/port/base.py:
(Port.api_results_directory): Added.
* Scripts/webkitpy/tool/steps/runtests.py:
(RunTests.run): Check if we should be running API tests.
(RunTests._run_api_tests): Generate script to run API tests with json output.
* Scripts/webkitpy/tool/steps/steps_unittest.py: Unit tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonconfigportspy">trunk/Tools/Scripts/webkitpy/common/config/ports.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolstepsruntestspy">trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py</a></li>
<li><a href="#trunkToolsScriptswebkitpytoolstepssteps_unittestpy">trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (214376 => 214377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-03-24 21:14:37 UTC (rev 214376)
+++ trunk/Tools/ChangeLog 2017-03-24 21:23:59 UTC (rev 214377)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2017-03-24 Srinivasan Vijayaraghavan <svijayaraghavan@apple.com>
</span><span class="cx">
</span><ins>+ webkitpy should be able to run API tests
+ https://bugs.webkit.org/show_bug.cgi?id=170028
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/webkitpy/common/config/ports.py:
+ (DeprecatedPort.run_api_tests_command): Added.
+ * Scripts/webkitpy/port/base.py:
+ (Port.api_results_directory): Added.
+ * Scripts/webkitpy/tool/steps/runtests.py:
+ (RunTests.run): Check if we should be running API tests.
+ (RunTests._run_api_tests): Generate script to run API tests with json output.
+ * Scripts/webkitpy/tool/steps/steps_unittest.py: Unit tests.
+
+2017-03-24 Srinivasan Vijayaraghavan <svijayaraghavan@apple.com>
+
</ins><span class="cx"> Add JSON results for API tests
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170021
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonconfigportspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/config/ports.py (214376 => 214377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/config/ports.py 2017-03-24 21:14:37 UTC (rev 214376)
+++ trunk/Tools/Scripts/webkitpy/common/config/ports.py 2017-03-24 21:23:59 UTC (rev 214377)
</span><span class="lines">@@ -130,7 +130,11 @@
</span><span class="cx"> def run_bindings_tests_command(self):
</span><span class="cx"> return self.script_shell_command("run-bindings-tests")
</span><span class="cx">
</span><ins>+ def run_api_tests_command(self, build_style=None):
+ command = self.script_shell_command("run-api-tests")
+ return self._append_build_style_flag(command, build_style)
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> class IOSPort(DeprecatedPort):
</span><span class="cx"> port_flag_name = "ios-device"
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (214376 => 214377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2017-03-24 21:14:37 UTC (rev 214376)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2017-03-24 21:23:59 UTC (rev 214377)
</span><span class="lines">@@ -814,6 +814,9 @@
</span><span class="cx"> def bindings_results_directory(self):
</span><span class="cx"> return self._build_path()
</span><span class="cx">
</span><ins>+ def api_results_directory(self):
+ return self._build_path()
+
</ins><span class="cx"> def results_directory(self):
</span><span class="cx"> """Absolute path to the place to store the test results (uses --results-directory)."""
</span><span class="cx"> if not self._results_directory:
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolstepsruntestspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py (214376 => 214377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2017-03-24 21:14:37 UTC (rev 214376)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/runtests.py 2017-03-24 21:23:59 UTC (rev 214377)
</span><span class="lines">@@ -62,6 +62,10 @@
</span><span class="cx"> self._run_javascriptcore_tests()
</span><span class="cx"> return
</span><span class="cx">
</span><ins>+ if self._options.group == "api":
+ self._run_api_tests()
+ return
+
</ins><span class="cx"> if self._options.group == "bindings":
</span><span class="cx"> self._run_bindings_tests()
</span><span class="cx"> return
</span><span class="lines">@@ -169,3 +173,10 @@
</span><span class="cx"> results_file_path = self._tool.filesystem.join(results_directory, "bindings_test_results.json")
</span><span class="cx"> args.append("--json-output=%s" % results_file_path)
</span><span class="cx"> self._tool.executive.run_and_throw_if_fail(args, cwd=self._tool.scm().checkout_root)
</span><ins>+
+ def _run_api_tests(self):
+ args = self._tool.deprecated_port().run_api_tests_command(self._options.build_style)
+ results_directory = self._tool.port_factory.get(options=self._options).api_results_directory()
+ results_file_path = self._tool.filesystem.join(results_directory, "api_test_results.json")
+ args.append("--json-output=%s" % results_file_path)
+ self._tool.executive.run_and_throw_if_fail(args, cwd=self._tool.scm().checkout_root)
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpytoolstepssteps_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py (214376 => 214377)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2017-03-24 21:14:37 UTC (rev 214376)
+++ trunk/Tools/Scripts/webkitpy/tool/steps/steps_unittest.py 2017-03-24 21:23:59 UTC (rev 214377)
</span><span class="lines">@@ -282,3 +282,29 @@
</span><span class="cx"> expected_logs = """Checking relevance of patch
</span><span class="cx"> This patch does not have relevant changes.
</span><span class="cx"> """
</span><ins>+
+ def test_runtests_api(self):
+ mock_options = self._step_options()
+ mock_options.non_interactive = False
+ mock_options.build_style = "release"
+ mock_options.group = "api"
+ step = steps.RunTests(MockTool(log_executive=True), mock_options)
+ tool = MockTool(log_executive=True)
+ tool._deprecated_port = DeprecatedPort()
+ step = steps.RunTests(tool, mock_options)
+ expected_logs = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-api-tests', '--release', '--json-output=/tmp/api_test_results.json'], cwd=/mock-checkout
+"""
+ OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
+
+ def test_runtests_api_debug(self):
+ mock_options = self._step_options()
+ mock_options.non_interactive = False
+ mock_options.build_style = "debug"
+ mock_options.group = "api"
+ step = steps.RunTests(MockTool(log_executive=True), mock_options)
+ tool = MockTool(log_executive=True)
+ tool._deprecated_port = DeprecatedPort()
+ step = steps.RunTests(tool, mock_options)
+ expected_logs = """MOCK run_and_throw_if_fail: ['Tools/Scripts/run-api-tests', '--debug', '--json-output=/tmp/api_test_results.json'], cwd=/mock-checkout
+"""
+ OutputCapture().assert_outputs(self, step.run, [{}], expected_logs=expected_logs)
</ins></span></pre>
</div>
</div>
</body>
</html>