<!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>[177535] 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/177535">177535</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2014-12-18 15:22:44 -0800 (Thu, 18 Dec 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Perf tests frequently fail saying "build not up to date"
https://bugs.webkit.org/show_bug.cgi?id=139786
Illegitimately yet authoritatively reviewed by Lucas Forschler.
Undo the rest of the first fix, and implement the behavior differently.
is_clean isn't automatically forwarded from config.json to properties.
* BuildSlaveSupport/build.webkit.org-config/config.json:
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(CleanBuildUnconditionally):
(CleanBuildUnconditionally.start):
(DownloadAndPerfTestFactory.__init__):
(DownloadAndPerfTestWebKit2Factory.__init__):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson">trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json</a></li>
<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="trunkToolsBuildSlaveSupportbuildwebkitorgconfigconfigjson"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json (177534 => 177535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-12-18 23:14:23 UTC (rev 177534)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2014-12-18 23:22:44 UTC (rev 177535)
</span><span class="lines">@@ -107,7 +107,6 @@
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "Apple MountainLion Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "mountainlion-release-perf-tests",
</span><del>- "is_clean": true,
</del><span class="cx"> "platform": "mac-mountainlion", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["bot141"]
</span><span class="cx"> },
</span><span class="lines">@@ -148,7 +147,6 @@
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "Apple Mavericks Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "mavericks-release-perf-tests",
</span><del>- "is_clean": true,
</del><span class="cx"> "platform": "mac-mavericks", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["bot135"]
</span><span class="cx"> },
</span><span class="lines">@@ -189,7 +187,6 @@
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "Apple Yosemite Release (Perf)", "type": "DownloadAndPerfTest", "builddir": "yosemite-release-perf-tests",
</span><del>- "is_clean": true,
</del><span class="cx"> "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["bot194"]
</span><span class="cx"> },
</span><span class="lines">@@ -249,7 +246,6 @@
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "GTK Linux 64-bit Release (Perf)", "type": "DownloadAndPerfTestWebKit2", "builddir": "gtk-linux-64-release-perf-tests",
</span><del>- "is_clean": true,
</del><span class="cx"> "platform": "gtk", "configuration": "release", "architectures": ["x86_64"],
</span><span class="cx"> "slavenames": ["gtk-linux-slave-8"]
</span><span class="cx"> },
</span></span></pre></div>
<a id="trunkToolsBuildSlaveSupportbuildwebkitorgconfigmastercfg"></a>
<div class="modfile"><h4>Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg (177534 => 177535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-12-18 23:14:23 UTC (rev 177534)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2014-12-18 23:22:44 UTC (rev 177535)
</span><span class="lines">@@ -161,6 +161,15 @@
</span><span class="cx"> return SKIPPED
</span><span class="cx"> return shell.Compile.start(self)
</span><span class="cx">
</span><ins>+class CleanBuildUnconditionally(shell.Compile):
+ name = "delete WebKitBuild directory"
+ description = ["deleting WebKitBuild directory"]
+ descriptionDone = ["deleted WebKitBuild directory"]
+ command = ["python", "./Tools/BuildSlaveSupport/clean-build", WithProperties("--platform=%(fullPlatform)s"), WithProperties("--%(configuration)s")]
+
+ def start(self):
+ return shell.Compile.start(self)
+
</ins><span class="cx"> class DeleteStaleBuildFiles(shell.Compile):
</span><span class="cx"> name = "delete stale build files"
</span><span class="cx"> description = ["deleting stale build files"]
</span><span class="lines">@@ -922,6 +931,7 @@
</span><span class="cx"> class DownloadAndPerfTestFactory(Factory):
</span><span class="cx"> def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
</span><span class="cx"> Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
</span><ins>+ self.addStep(CleanBuildUnconditionally())
</ins><span class="cx"> self.addStep(DownloadBuiltProduct())
</span><span class="cx"> self.addStep(ExtractBuiltProduct())
</span><span class="cx"> self.addStep(RunAndUploadPerfTests())
</span><span class="lines">@@ -929,6 +939,7 @@
</span><span class="cx"> class DownloadAndPerfTestWebKit2Factory(Factory):
</span><span class="cx"> def __init__(self, platform, configuration, architectures, additionalArguments=None, SVNMirror=None, **kwargs):
</span><span class="cx"> Factory.__init__(self, platform, configuration, architectures, False, additionalArguments, SVNMirror, **kwargs)
</span><ins>+ self.addStep(CleanBuildUnconditionally())
</ins><span class="cx"> self.addStep(DownloadBuiltProduct())
</span><span class="cx"> self.addStep(ExtractBuiltProduct())
</span><span class="cx"> self.addStep(RunAndUploadPerfTestsWebKit2())
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (177534 => 177535)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-12-18 23:14:23 UTC (rev 177534)
+++ trunk/Tools/ChangeLog 2014-12-18 23:22:44 UTC (rev 177535)
</span><span class="lines">@@ -1,5 +1,23 @@
</span><span class="cx"> 2014-12-18 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><ins>+ Perf tests frequently fail saying "build not up to date"
+ https://bugs.webkit.org/show_bug.cgi?id=139786
+
+ Illegitimately yet authoritatively reviewed by Lucas Forschler.
+
+ Undo the rest of the first fix, and implement the behavior differently.
+
+ is_clean isn't automatically forwarded from config.json to properties.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json:
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (CleanBuildUnconditionally):
+ (CleanBuildUnconditionally.start):
+ (DownloadAndPerfTestFactory.__init__):
+ (DownloadAndPerfTestWebKit2Factory.__init__):
+
+2014-12-18 Alexey Proskuryakov <ap@apple.com>
+
</ins><span class="cx"> Roll out part of the previous patch - BuildAndPerfTestWebKit2 is used by Efl.
</span><span class="cx"> I thought that it was unused because grepping for BuildAndPerfTestWebKit2Factory
</span><span class="cx"> found nothing.
</span></span></pre>
</div>
</div>
</body>
</html>