<!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>[180039] 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/180039">180039</a></dd>
<dt>Author</dt> <dd>ossy@webkit.org</dd>
<dt>Date</dt> <dd>2015-02-13 06:37:08 -0800 (Fri, 13 Feb 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>[buildbot] Remove buildJSCTool cruft from master.cfg
https://bugs.webkit.org/show_bug.cgi?id=141513

Reviewed by Alexey Proskuryakov.

* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunJavaScriptCoreTests):
(RunJavaScriptCoreTests.start):
(RunWebKitTests):
(RunWebKitTests.start):
(TestFactory.__init__):
(TestLeaksFactory.__init__):
(RunJavaScriptCoreTests.__init__): Deleted.
(RunWebKitTests.__init__): Deleted.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</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 (180038 => 180039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg        2015-02-13 12:48:09 UTC (rev 180038)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg        2015-02-13 14:37:08 UTC (rev 180039)
</span><span class="lines">@@ -283,18 +283,11 @@
</span><span class="cx">     name = &quot;jscore-test&quot;
</span><span class="cx">     description = [&quot;jscore-tests running&quot;]
</span><span class="cx">     descriptionDone = [&quot;jscore-tests&quot;]
</span><del>-    command = [&quot;perl&quot;, &quot;./Tools/Scripts/run-javascriptcore-tests&quot;, WithProperties(&quot;--%(configuration)s&quot;)]
</del><ins>+    command = [&quot;perl&quot;, &quot;./Tools/Scripts/run-javascriptcore-tests&quot;, &quot;--no-build&quot;, WithProperties(&quot;--%(configuration)s&quot;)]
</ins><span class="cx">     failedTestsFormatString = &quot;%d JSC test%s failed&quot;
</span><span class="cx"> 
</span><del>-    def __init__(self, buildJSCTool=True, *args, **kwargs):
-        self.buildJSCTool = buildJSCTool
-        shell.Test.__init__(self, *args, **kwargs)
-        self.addFactoryArguments(buildJSCTool=buildJSCTool)
-
</del><span class="cx">     def start(self):
</span><span class="cx">         appendCustomBuildFlags(self, self.getProperty('platform'))
</span><del>-        if not self.buildJSCTool:
-            self.setCommand(self.command + ['--no-build'])
</del><span class="cx">         return shell.Test.start(self)
</span><span class="cx"> 
</span><span class="cx">     def countFailures(self, cmd):
</span><span class="lines">@@ -315,6 +308,7 @@
</span><span class="cx">     description = [&quot;layout-tests running&quot;]
</span><span class="cx">     descriptionDone = [&quot;layout-tests&quot;]
</span><span class="cx">     command = [&quot;python&quot;, &quot;./Tools/Scripts/run-webkit-tests&quot;,
</span><ins>+               &quot;--no-build&quot;,
</ins><span class="cx">                &quot;--no-show-results&quot;,
</span><span class="cx">                &quot;--no-new-test-results&quot;,
</span><span class="cx">                &quot;--no-sample-on-timeout&quot;,
</span><span class="lines">@@ -324,29 +318,18 @@
</span><span class="cx">                &quot;--master-name&quot;, &quot;webkit.org&quot;,
</span><span class="cx">                &quot;--test-results-server&quot;, &quot;webkit-test-results.appspot.com&quot;,
</span><span class="cx">                &quot;--debug-rwt-logging&quot;,
</span><ins>+               &quot;--exit-after-n-crashes-or-timeouts&quot;, &quot;50&quot;,
+               &quot;--exit-after-n-failures&quot;, &quot;500&quot;,
</ins><span class="cx">                WithProperties(&quot;--%(configuration)s&quot;)]
</span><span class="cx"> 
</span><del>-    def __init__(self, buildJSCTool=True, *args, **kwargs):
-        self.buildJSCTool = buildJSCTool
-        shell.Test.__init__(self, *args, **kwargs)
-        self.addFactoryArguments(buildJSCTool=buildJSCTool)
-
</del><span class="cx">     def start(self):
</span><span class="cx">         platform = self.getProperty('platform')
</span><span class="cx">         appendCustomBuildFlags(self, platform, self.getProperty('fullPlatform'))
</span><span class="cx">         additionalArguments = self.getProperty('additionalArguments')
</span><span class="cx"> 
</span><del>-        self.setCommand(self.command + [&quot;--exit-after-n-crashes-or-timeouts&quot;, &quot;50&quot;, &quot;--exit-after-n-failures&quot;, &quot;500&quot;])
-
-        if platform.startswith('mac'):
-            self.setCommand(self.command + ['--no-build'])
</del><span class="cx">         if platform == &quot;win&quot;:
</span><del>-            rootArgument = ['--root=' + os.path.join(&quot;WebKitBuild&quot;, self.getProperty('configuration'), &quot;bin32&quot;)]
-            self.setCommand(self.command + ['--no-build', '--batch-size', '100'])
-        else:
-            rootArgument = ['--root=WebKitBuild/bin']
-        if not self.buildJSCTool:
-            self.setCommand(self.command + rootArgument)
</del><ins>+            self.setCommand(self.command + ['--batch-size', '100', '--root=' + os.path.join(&quot;WebKitBuild&quot;, self.getProperty('configuration'), &quot;bin32&quot;)])
+
</ins><span class="cx">         if additionalArguments:
</span><span class="cx">             self.setCommand(self.command + additionalArguments)
</span><span class="cx">         return shell.Test.start(self)
</span><span class="lines">@@ -807,9 +790,9 @@
</span><span class="cx">         Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
</span><span class="cx">         self.addStep(DownloadBuiltProduct())
</span><span class="cx">         self.addStep(ExtractBuiltProduct())
</span><del>-        self.addStep(RunJavaScriptCoreTests(buildJSCTool=False))
</del><ins>+        self.addStep(RunJavaScriptCoreTests())
</ins><span class="cx">         if self.LayoutTestClass:
</span><del>-            self.addStep(self.LayoutTestClass(buildJSCTool=(platform != 'win')))
</del><ins>+            self.addStep(self.LayoutTestClass())
</ins><span class="cx"> 
</span><span class="cx">         if unitTestsSupported(configuration, platform): 
</span><span class="cx">             self.addStep(RunUnitTests())
</span><span class="lines">@@ -879,7 +862,7 @@
</span><span class="cx">         Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
</span><span class="cx">         self.addStep(DownloadBuiltProduct())
</span><span class="cx">         self.addStep(ExtractBuiltProduct())
</span><del>-        self.addStep(RunWebKitLeakTests(buildJSCTool=(platform != 'win'))) # FIXME: Why is buildJSCTool needed?
</del><ins>+        self.addStep(RunWebKitLeakTests())
</ins><span class="cx">         self.addStep(ArchiveTestResults())
</span><span class="cx">         self.addStep(UploadTestResults())
</span><span class="cx">         self.addStep(ExtractTestResultsAndLeaks())
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180038 => 180039)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-02-13 12:48:09 UTC (rev 180038)
+++ trunk/Tools/ChangeLog        2015-02-13 14:37:08 UTC (rev 180039)
</span><span class="lines">@@ -1,5 +1,22 @@
</span><span class="cx"> 2015-02-13  Csaba Osztrogon√°c  &lt;ossy@webkit.org&gt;
</span><span class="cx"> 
</span><ins>+        [buildbot] Remove buildJSCTool cruft from master.cfg
+        https://bugs.webkit.org/show_bug.cgi?id=141513
+
+        Reviewed by Alexey Proskuryakov.
+
+        * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+        (RunJavaScriptCoreTests):
+        (RunJavaScriptCoreTests.start):
+        (RunWebKitTests):
+        (RunWebKitTests.start):
+        (TestFactory.__init__):
+        (TestLeaksFactory.__init__):
+        (RunJavaScriptCoreTests.__init__): Deleted.
+        (RunWebKitTests.__init__): Deleted.
+
+2015-02-13  Csaba Osztrogon√°c  &lt;ossy@webkit.org&gt;
+
</ins><span class="cx">         Unreviewed, remove empty directories.
</span><span class="cx"> 
</span><span class="cx">         * DumpRenderTree/gtk: Removed.
</span></span></pre>
</div>
</div>

</body>
</html>