<!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>[213097] 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/213097">213097</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-27 15:07:25 -0800 (Mon, 27 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add machine-readable results for bindings tests
https://bugs.webkit.org/show_bug.cgi?id=168626
Patch by Srinivasan Vijayaraghavan <svijayaraghavan@apple.com> on 2017-02-27
Reviewed by Alexey Proskuryakov.
* Scripts/run-bindings-tests:
(main): Add optional --json-output command-line parameter.
* Scripts/webkitpy/bindings/main.py:
(BindingsTests.__init__): Add variables to store machine-readable results.
(BindingsTests.detect_changes): Store results in machine-readable form if applicable.
(BindingsTests.main): Write data to JSON file if applicable.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunbindingstests">trunk/Tools/Scripts/run-bindings-tests</a></li>
<li><a href="#trunkToolsScriptswebkitpybindingsmainpy">trunk/Tools/Scripts/webkitpy/bindings/main.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (213096 => 213097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-02-27 22:54:26 UTC (rev 213096)
+++ trunk/Tools/ChangeLog 2017-02-27 23:07:25 UTC (rev 213097)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-02-27 Srinivasan Vijayaraghavan <svijayaraghavan@apple.com>
+
+ Add machine-readable results for bindings tests
+ https://bugs.webkit.org/show_bug.cgi?id=168626
+
+ Reviewed by Alexey Proskuryakov.
+
+ * Scripts/run-bindings-tests:
+ (main): Add optional --json-output command-line parameter.
+ * Scripts/webkitpy/bindings/main.py:
+ (BindingsTests.__init__): Add variables to store machine-readable results.
+ (BindingsTests.detect_changes): Store results in machine-readable form if applicable.
+ (BindingsTests.main): Write data to JSON file if applicable.
+
</ins><span class="cx"> 2017-02-27 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed, roll out r213065.
</span></span></pre></div>
<a id="trunkToolsScriptsrunbindingstests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-bindings-tests (213096 => 213097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-bindings-tests 2017-02-27 22:54:26 UTC (rev 213096)
+++ trunk/Tools/Scripts/run-bindings-tests 2017-02-27 23:07:25 UTC (rev 213097)
</span><span class="lines">@@ -29,6 +29,7 @@
</span><span class="cx"> # patch. This makes it easier to track and review changes in generated code.
</span><span class="cx">
</span><span class="cx"> import optparse
</span><ins>+import os
</ins><span class="cx"> import sys
</span><span class="cx"> from webkitpy.common.system import executive
</span><span class="cx">
</span><span class="lines">@@ -43,12 +44,17 @@
</span><span class="cx"> help='Disable verobse output')
</span><span class="cx"> option_parser.add_option('--reset-results', action='store_true', default=False,
</span><span class="cx"> help='Overwrites the reference files with the generated results')
</span><ins>+ option_parser.add_option('--json-output', action='store', type='string', dest='json_file_name',
+ help='Create a file at specified path, listing test results in JSON format.')
</ins><span class="cx"> options, args = option_parser.parse_args()
</span><span class="cx">
</span><span class="cx"> from webkitpy.bindings.main import BindingsTests
</span><span class="cx">
</span><del>- return BindingsTests(options.reset_results, [ 'JS' ], executive.Executive(), not options.no_verbose, args).main()
</del><ins>+ if options.json_file_name:
+ options.json_file_name = os.path.abspath(options.json_file_name)
</ins><span class="cx">
</span><ins>+ return BindingsTests(options.reset_results, [ 'JS' ], executive.Executive(), not options.no_verbose, args, options.json_file_name).main()
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> if __name__ == '__main__':
</span><span class="cx"> sys.exit(main(sys.argv))
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybindingsmainpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/bindings/main.py (213096 => 213097)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/bindings/main.py 2017-02-27 22:54:26 UTC (rev 213096)
+++ trunk/Tools/Scripts/webkitpy/bindings/main.py 2017-02-27 23:07:25 UTC (rev 213097)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> import fnmatch
</span><ins>+import json
</ins><span class="cx"> import os
</span><span class="cx"> import os.path
</span><span class="cx"> import shutil
</span><span class="lines">@@ -35,13 +36,18 @@
</span><span class="cx">
</span><span class="cx"> class BindingsTests:
</span><span class="cx">
</span><del>- def __init__(self, reset_results, generators, executive, verbose, patterns):
</del><ins>+ def __init__(self, reset_results, generators, executive, verbose, patterns, json_file_name):
</ins><span class="cx"> self.reset_results = reset_results
</span><span class="cx"> self.generators = generators
</span><span class="cx"> self.executive = executive
</span><span class="cx"> self.verbose = verbose
</span><span class="cx"> self.patterns = patterns
</span><ins>+ self.json_file_name = json_file_name
</ins><span class="cx">
</span><ins>+ if self.json_file_name:
+ self.failures = []
+ self.errors = []
+
</ins><span class="cx"> def generate_from_idl(self, generator, idl_file, output_directory, supplemental_dependency_file):
</span><span class="cx"> cmd = ['perl', '-w',
</span><span class="cx"> '-IWebCore/bindings/scripts',
</span><span class="lines">@@ -109,11 +115,15 @@
</span><span class="cx"> except ScriptError, e:
</span><span class="cx"> output = e.output
</span><span class="cx"> exit_code = e.exit_code
</span><ins>+ if self.json_file_name:
+ self.errors.append("(%s) %s" % (generator, output_file))
</ins><span class="cx">
</span><span class="cx"> if exit_code or output:
</span><span class="cx"> print 'FAIL: (%s) %s' % (generator, output_file)
</span><span class="cx"> print output
</span><span class="cx"> changes_found = True
</span><ins>+ if self.json_file_name:
+ self.failures.append("(%s) %s" % (generator, output_file))
</ins><span class="cx"> elif self.verbose:
</span><span class="cx"> print 'PASS: (%s) %s' % (generator, output_file)
</span><span class="cx"> return changes_found
</span><span class="lines">@@ -189,6 +199,16 @@
</span><span class="cx"> os.remove(window_constructors_file)
</span><span class="cx"> os.remove(workerglobalscope_constructors_file)
</span><span class="cx"> os.remove(dedicatedworkerglobalscope_constructors_file)
</span><ins>+
+ if self.json_file_name:
+ json_data = {
+ 'failures': self.failures,
+ 'errors': self.errors,
+ }
+
+ with open(self.json_file_name, 'w') as json_file:
+ json.dump(json_data, json_file)
+
</ins><span class="cx"> print ''
</span><span class="cx"> if all_tests_passed:
</span><span class="cx"> print 'All tests PASS!'
</span></span></pre>
</div>
</div>
</body>
</html>