<!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>[179122] 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/179122">179122</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-01-26 10:18:07 -0800 (Mon, 26 Jan 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Leaks bot shouldn't run JSC tests
https://bugs.webkit.org/show_bug.cgi?id=140877
Reviewed by Darin Adler.
Shaves off 48 minutes of time.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(TestLeaksFactory): Slim down the leaks queue.
* BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.print_leaks_summary):
* Scripts/webkitpy/port/mac.py:
(MacPort.print_leaks_summary):
Don't yell when leaks are detected.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg</a></li>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmacpy">trunk/Tools/Scripts/webkitpy/port/mac.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (179121 => 179122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-01-26 18:18:07 UTC (rev 179122)
</span><span class="lines">@@ -906,11 +906,16 @@
</span><span class="cx"> class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
</span><span class="cx"> LayoutTestClass = None
</span><span class="cx">
</span><del>-class TestLeaksFactory(TestFactory):
- LayoutTestClass = RunWebKitLeakTests
- ExtractTestResultsClass = ExtractTestResultsAndLeaks
</del><ins>+class TestLeaksFactory(Factory):
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
+ self.addStep(DownloadBuiltProduct())
+ self.addStep(ExtractBuiltProduct())
+ self.addStep(RunWebKitLeakTests(buildJSCTool=(platform != 'win'))) # FIXME: Why is buildJSCTool needed?
+ self.addStep(ArchiveTestResults())
+ self.addStep(UploadTestResults())
+ self.addStep(ExtractTestResultsAndLeaks())
</ins><span class="cx">
</span><del>-
</del><span class="cx"> class TestWebKit2Factory(TestFactory):
</span><span class="cx"> LayoutTestClass = RunWebKit2Tests
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py (179121 => 179122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py 2015-01-26 18:18:07 UTC (rev 179122)
</span><span class="lines">@@ -51,12 +51,12 @@
</span><span class="cx"> def test_nrwt_leaks_parsing(self):
</span><span class="cx"> run_webkit_tests = RunWebKitTests() # pylint is confused by the way we import the module ... pylint: disable-msg=E0602
</span><span class="cx"> log_text = """
</span><del>-12:44:24.295 77706 13981 total leaks found for a total of 197,936 bytes!
-12:44:24.295 77706 1 unique leaks found!
</del><ins>+12:44:24.295 77706 13981 total leaks found for a total of 197,936 bytes.
+12:44:24.295 77706 1 unique leaks found.
</ins><span class="cx"> """
</span><span class="cx"> expected_incorrect_lines = [
</span><del>- '13981 total leaks found for a total of 197,936 bytes!',
- '1 unique leaks found!',
</del><ins>+ '13981 total leaks found for a total of 197,936 bytes.',
+ '1 unique leaks found.',
</ins><span class="cx"> ]
</span><span class="cx"> run_webkit_tests._parseRunWebKitTestsOutput(log_text)
</span><span class="cx"> self.assertEqual(run_webkit_tests.incorrectLayoutLines, expected_incorrect_lines)
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (179121 => 179122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/ChangeLog 2015-01-26 18:18:07 UTC (rev 179122)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-01-26 Alexey Proskuryakov <ap@apple.com>
+
+ Leaks bot shouldn't run JSC tests
+ https://bugs.webkit.org/show_bug.cgi?id=140877
+
+ Reviewed by Darin Adler.
+
+ Shaves off 48 minutes of time.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (TestLeaksFactory): Slim down the leaks queue.
+
+ * BuildSlaveSupport/build.webkit.org-config/mastercfg_unittest.py:
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.print_leaks_summary):
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.print_leaks_summary):
+ Don't yell when leaks are detected.
+
</ins><span class="cx"> 2015-01-26 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> Refactor run-javascriptcore-tests
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (179121 => 179122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2015-01-26 18:18:07 UTC (rev 179122)
</span><span class="lines">@@ -230,8 +230,8 @@
</span><span class="cx"> return
</span><span class="cx"> total_bytes_string, unique_leaks = self._leak_detector.count_total_bytes_and_unique_leaks(leaks_files)
</span><span class="cx"> total_leaks = self._leak_detector.count_total_leaks(leaks_files)
</span><del>- _log.info("%s total leaks found for a total of %s!" % (total_leaks, total_bytes_string))
- _log.info("%s unique leaks found!" % unique_leaks)
</del><ins>+ _log.info("%s total leaks found for a total of %s." % (total_leaks, total_bytes_string))
+ _log.info("%s unique leaks found." % unique_leaks)
</ins><span class="cx">
</span><span class="cx"> def _path_to_webcore_library(self):
</span><span class="cx"> return self._build_path('WebCore.framework/Versions/A/WebCore')
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (179121 => 179122)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py 2015-01-26 18:03:57 UTC (rev 179121)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2015-01-26 18:18:07 UTC (rev 179122)
</span><span class="lines">@@ -172,8 +172,8 @@
</span><span class="cx"> return
</span><span class="cx"> total_bytes_string, unique_leaks = self._leak_detector.count_total_bytes_and_unique_leaks(leaks_files)
</span><span class="cx"> total_leaks = self._leak_detector.count_total_leaks(leaks_files)
</span><del>- _log.info("%s total leaks found for a total of %s!" % (total_leaks, total_bytes_string))
- _log.info("%s unique leaks found!" % unique_leaks)
</del><ins>+ _log.info("%s total leaks found for a total of %s." % (total_leaks, total_bytes_string))
+ _log.info("%s unique leaks found." % unique_leaks)
</ins><span class="cx">
</span><span class="cx"> def _check_port_build(self):
</span><span class="cx"> return self.get_option('nojava') or self._build_java_test_support()
</span></span></pre>
</div>
</div>
</body>
</html>