<!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>[180999] 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/180999">180999</a></dd>
<dt>Author</dt> <dd>mmirman@apple.com</dd>
<dt>Date</dt> <dd>2015-03-04 07:52:13 -0800 (Wed, 04 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleaned up BuildAndTestFactory to not be a near duplicate of TestFactory
https://bugs.webkit.org/show_bug.cgi?id=142230
Reviewed by Csaba Osztrogonác.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(TestFactory):
(TestFactory.getProduct): Added
(TestFactory.__init__): moved downloader to getProduct
(BuildAndTestFactory):
(BuildAndTestFactory.getProduct): Added
(BuildAndTestFactory.__init__): made to call TestFactory.__init__ and append steps to the end.
(BuildAndTestWebKit2Factory): Deleted. Wasn't used anywhere.</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 (180998 => 180999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-03-04 14:19:47 UTC (rev 180998)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2015-03-04 15:52:13 UTC (rev 180999)
</span><span class="lines">@@ -780,11 +780,14 @@
</span><span class="cx"> class TestFactory(Factory):
</span><span class="cx"> JSCTestClass = RunJavaScriptCoreTests
</span><span class="cx"> LayoutTestClass = RunWebKitTests
</span><del>- ExtractTestResultsClass = ExtractTestResults
- def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None):
- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror)
</del><ins>+
+ def getProduct(self):
</ins><span class="cx"> self.addStep(DownloadBuiltProduct())
</span><span class="cx"> self.addStep(ExtractBuiltProduct())
</span><ins>+
+ def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
+ Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
+ self.getProduct()
</ins><span class="cx"> if self.JSCTestClass:
</span><span class="cx"> self.addStep(self.JSCTestClass())
</span><span class="cx"> if self.LayoutTestClass:
</span><span class="lines">@@ -798,35 +801,19 @@
</span><span class="cx"> if self.LayoutTestClass:
</span><span class="cx"> self.addStep(ArchiveTestResults())
</span><span class="cx"> self.addStep(UploadTestResults())
</span><del>- self.addStep(self.ExtractTestResultsClass())
</del><ins>+ self.addStep(ExtractTestResults())
</ins><span class="cx"> if platform == "efl":
</span><del>- self.addStep(RunEflAPITests)
</del><ins>+ self.addStep(RunEflAPITests())
</ins><span class="cx"> if platform == "gtk":
</span><span class="cx"> self.addStep(RunGtkAPITests())
</span><span class="cx"> self.addStep(RunGtkWebKitGObjectDOMBindingsAPIBreakTests())
</span><span class="cx">
</span><del>-class BuildAndTestFactory(Factory):
- CompileClass = CompileWebKit
- LayoutTestClass = RunWebKitTests
- ExtractTestResultsClass = ExtractTestResults
</del><ins>+class BuildAndTestFactory(TestFactory):
+ def getProduct(self):
+ self.addStep(CompileWebKit())
+
</ins><span class="cx"> def __init__(self, platform, configuration, architectures, triggers=None, additionalArguments=None, SVNMirror=None, **kwargs):
</span><del>- Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
- self.addStep(self.CompileClass())
- self.addStep(RunJavaScriptCoreTests())
- if self.LayoutTestClass:
- self.addStep(self.LayoutTestClass())
- self.addStep(RunPythonTests())
- self.addStep(RunPerlTests())
- self.addStep(RunBindingsTests())
- if self.LayoutTestClass:
- self.addStep(ArchiveTestResults())
- self.addStep(UploadTestResults())
- self.addStep(self.ExtractTestResultsClass())
- if platform == "efl":
- self.addStep(RunEflAPITests())
- if platform == "gtk":
- self.addStep(RunGtkAPITests())
- self.addStep(RunGtkWebKitGObjectDOMBindingsAPIBreakTests())
</del><ins>+ TestFactory.__init__(self, platform, configuration, architectures, additionalArguments, SVNMirror, **kwargs)
</ins><span class="cx"> if triggers:
</span><span class="cx"> self.addStep(ArchiveBuiltProduct())
</span><span class="cx"> self.addStep(UploadBuiltProduct())
</span><span class="lines">@@ -844,10 +831,6 @@
</span><span class="cx"> self.addStep(Compile32bitJSC())
</span><span class="cx"> self.addStep(Run32bitJSCTests())
</span><span class="cx">
</span><del>-class BuildAndTestWebKit2Factory(BuildAndTestFactory):
- CompileClass = CompileWebKit
- LayoutTestClass = RunWebKit2Tests
-
</del><span class="cx"> class BuildAndNonLayoutTestFactory(BuildAndTestFactory):
</span><span class="cx"> LayoutTestClass = None
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (180998 => 180999)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-03-04 14:19:47 UTC (rev 180998)
+++ trunk/Tools/ChangeLog 2015-03-04 15:52:13 UTC (rev 180999)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2015-03-04 Matthew Mirman <mmirman@apple.com>
+
+ Cleaned up BuildAndTestFactory to not be a near duplicate of TestFactory
+ https://bugs.webkit.org/show_bug.cgi?id=142230
+
+ Reviewed by Csaba Osztrogonác.
+
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (TestFactory):
+ (TestFactory.getProduct): Added
+ (TestFactory.__init__): moved downloader to getProduct
+ (BuildAndTestFactory):
+ (BuildAndTestFactory.getProduct): Added
+ (BuildAndTestFactory.__init__): made to call TestFactory.__init__ and append steps to the end.
+ (BuildAndTestWebKit2Factory): Deleted. Wasn't used anywhere.
+
</ins><span class="cx"> 2015-03-04 Debarshi Ray <debarshir@gnome.org>
</span><span class="cx">
</span><span class="cx"> [GTK] WebView should hold a reference on WebContext because non-default contexts are a reality
</span></span></pre>
</div>
</div>
</body>
</html>