<!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>[185031] 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/185031">185031</a></dd>
<dt>Author</dt> <dd>rniwa@webkit.org</dd>
<dt>Date</dt> <dd>2015-05-30 01:52:28 -0700 (Sat, 30 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed build fix after <a href="http://trac.webkit.org/projects/webkit/changeset/185014">r185014</a>. Some tests only have subtests and not metrics.
* Scripts/webkitpy/benchmark_runner/benchmark_results.py:
(BenchmarkResults._lint_subtest_results):
* Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py:
(test_aggregate_nested_results):
(test_lint_results):
* WinLauncher/WinLauncher.vcxproj/WinLauncherResource.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_resultspy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py</a></li>
<li><a href="#trunkToolsScriptswebkitpybenchmark_runnerbenchmark_results_unittestpy">trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (185030 => 185031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-05-30 03:55:15 UTC (rev 185030)
+++ trunk/Tools/ChangeLog 2015-05-30 08:52:28 UTC (rev 185031)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2015-05-30 Ryosuke Niwa <rniwa@webkit.org>
+
+ Unreviewed build fix after r185014. Some tests only have subtests and not metrics.
+
+ * Scripts/webkitpy/benchmark_runner/benchmark_results.py:
+ (BenchmarkResults._lint_subtest_results):
+ * Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py:
+ (test_aggregate_nested_results):
+ (test_lint_results):
+ * WinLauncher/WinLauncher.vcxproj/WinLauncherResource.h:
+
</ins><span class="cx"> 2015-05-29 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> run-benchmark should print out the results
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_resultspy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py (185030 => 185031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py 2015-05-30 03:55:15 UTC (rev 185030)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results.py 2015-05-30 08:52:28 UTC (rev 185031)
</span><span class="lines">@@ -179,22 +179,23 @@
</span><span class="cx"> def _lint_subtest_results(cls, subtests, parent_needing_aggregation):
</span><span class="cx"> iteration_groups_by_config = {}
</span><span class="cx"> for test_name, test in subtests.iteritems():
</span><del>- if 'metrics' not in test:
- raise TypeError('"%s" does not contain metrics' % test_name)
</del><ins>+ needs_aggregation = False
</ins><span class="cx">
</span><del>- metrics = test['metrics']
- if not isinstance(metrics, dict):
- raise TypeError('The metrics in "%s" is not a dictionary' % test_name)
</del><ins>+ if 'metrics' not in test and 'tests' not in test:
+ raise TypeError('"%s" does not contain metrics or tests' % test_name)
</ins><span class="cx">
</span><del>- needs_aggregation = False
- for metric_name, metric in metrics.iteritems():
- if isinstance(metric, list):
- cls._lint_aggregator_list(test_name, metric_name, metric)
- needs_aggregation = True
- elif isinstance(metric, dict):
- cls._lint_configuration(test_name, metric_name, metric, parent_needing_aggregation, iteration_groups_by_config)
- else:
- raise TypeError('"%s" metric of "%s" was not an aggregator list or a dictionary of configurations: %s' % (metric_name, test_name, str(metric)))
</del><ins>+ if 'metrics' in test:
+ metrics = test['metrics']
+ if not isinstance(metrics, dict):
+ raise TypeError('The metrics in "%s" is not a dictionary' % test_name)
+ for metric_name, metric in metrics.iteritems():
+ if isinstance(metric, list):
+ cls._lint_aggregator_list(test_name, metric_name, metric)
+ needs_aggregation = True
+ elif isinstance(metric, dict):
+ cls._lint_configuration(test_name, metric_name, metric, parent_needing_aggregation, iteration_groups_by_config)
+ else:
+ raise TypeError('"%s" metric of "%s" was not an aggregator list or a dictionary of configurations: %s' % (metric_name, test_name, str(metric)))
</ins><span class="cx">
</span><span class="cx"> if 'tests' in test:
</span><span class="cx"> cls._lint_subtest_results(test['tests'], test_name if needs_aggregation else None)
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpybenchmark_runnerbenchmark_results_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py (185030 => 185031)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py 2015-05-30 03:55:15 UTC (rev 185030)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/benchmark_results_unittest.py 2015-05-30 08:52:28 UTC (rev 185031)
</span><span class="lines">@@ -195,7 +195,7 @@
</span><span class="cx"> 'SubTest2': {'metrics': {'Time': {None: {'current': [5, 6]}}}, 'tests': {}}}}})
</span><span class="cx">
</span><span class="cx"> def test_lint_results(self):
</span><del>- with self.assertRaisesRegexp(TypeError, r'"SomeTest" does not contain metrics'):
</del><ins>+ with self.assertRaisesRegexp(TypeError, r'"SomeTest" does not contain metrics or tests'):
</ins><span class="cx"> BenchmarkResults._lint_results({'SomeTest': {}})
</span><span class="cx">
</span><span class="cx"> with self.assertRaisesRegexp(TypeError, r'The metrics in "SomeTest" is not a dictionary'):
</span></span></pre>
</div>
</div>
</body>
</html>