<!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>[205968] 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/205968">205968</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2016-09-15 08:30:00 -0700 (Thu, 15 Sep 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move --no-sample-on-timeout to config.json for each bot
https://bugs.webkit.org/show_bug.cgi?id=161964
Reviewed by Daniel Bates.
Roll out changes from 205573 and move them into config.json. At this time, only macOS and iOS simulator sample a process on timeout, —no-sample-on-timeout is unneeded for GTK, EFL and Windows.
* BuildSlaveSupport/build.webkit.org-config/config.json: Each bot now independently defines if it will be running sample on timeout.
* BuildSlaveSupport/build.webkit.org-config/master.cfg:
(RunWebKitTests.start): Rolled out changes from 205573.</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 (205967 => 205968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2016-09-15 11:18:08 UTC (rev 205967)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/config.json 2016-09-15 15:30:00 UTC (rev 205968)
</span><span class="lines">@@ -97,12 +97,12 @@
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple El Capitan Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "elcapitan-debug-tests-wk1",
</span><span class="cx"> "platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot133", "bot145"]
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple El Capitan Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "elcapitan-debug-tests-wk2",
</span><span class="cx"> "platform": "mac-elcapitan", "configuration": "debug", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot162", "bot165"]
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple El Capitan LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "elcapitan-cloop-debug",
</span><span class="lines">@@ -124,12 +124,12 @@
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple El Capitan Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "elcapitan-release-tests-wk1",
</span><span class="cx"> "platform": "mac-elcapitan", "configuration": "release", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot173", "bot174"]
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple El Capitan Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "elcapitan-release-tests-wk2",
</span><span class="cx"> "platform": "mac-elcapitan", "configuration": "release", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot208", "bot209"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -139,7 +139,7 @@
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple El Capitan (Leaks)", "type": "TestWebKit1Leaks", "builddir": "elcapitan-leaks",
</span><span class="cx"> "platform": "mac-elcapitan", "configuration": "release", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot121"]
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple El Capitan Release (32-bit Build)", "type": "Build", "builddir": "elcapitan-32bit-release",
</span><span class="lines">@@ -161,12 +161,12 @@
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple Yosemite Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "yosemite-debug-tests-wk1",
</span><span class="cx"> "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot182", "bot183"]
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple Yosemite Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "yosemite-debug-tests-wk2",
</span><span class="cx"> "platform": "mac-yosemite", "configuration": "debug", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot184", "bot185"]
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple Yosemite LLINT CLoop (BuildAndTest)", "type": "BuildAndTestLLINTCLoop", "builddir": "yosemite-cloop-debug",
</span><span class="lines">@@ -188,12 +188,12 @@
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple Yosemite Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "yosemite-release-tests-wk1",
</span><span class="cx"> "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot190", "bot191"]
</span><span class="cx"> },
</span><span class="cx"> { "name": "Apple Yosemite Release WK2 (Tests)", "type": "TestAllButJSC", "builddir": "yosemite-release-tests-wk2",
</span><span class="cx"> "platform": "mac-yosemite", "configuration": "release", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot192", "bot193"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -221,13 +221,13 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "Apple iOS 10 Simulator Release WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-10-release-tests-wk1",
</span><span class="cx"> "platform": "ios-simulator-10", "configuration": "release", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot197", "bot215"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="cx"> "name": "Apple iOS 10 Simulator Debug WK1 (Tests)", "type": "TestWebKit1AllButJSC", "builddir": "ios-simulator-10-debug-tests-wk1",
</span><span class="cx"> "platform": "ios-simulator-10", "configuration": "debug", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot216", "bot217"]
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -239,7 +239,7 @@
</span><span class="cx"> {
</span><span class="cx"> "name": "Apple iOS 10 Simulator Debug WK2 (Tests)", "type": "TestAllButJSC", "builddir": "ios-simulator-10-debug-tests-wk2",
</span><span class="cx"> "platform": "ios-simulator-10", "configuration": "debug", "architectures": ["x86_64"],
</span><del>- "additionalArguments": ["--no-retry-failures"],
</del><ins>+ "additionalArguments": ["--no-retry-failures", "--no-sample-on-timeout"],
</ins><span class="cx"> "slavenames": ["bot653", "bot654"]
</span><span class="cx"> },
</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 (205967 => 205968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2016-09-15 11:18:08 UTC (rev 205967)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg 2016-09-15 15:30:00 UTC (rev 205968)
</span><span class="lines">@@ -357,9 +357,6 @@
</span><span class="cx"> if platform == "win":
</span><span class="cx"> self.setCommand(self.command + ['--batch-size', '100', '--root=' + os.path.join("WebKitBuild", self.getProperty('configuration'), "bin32")])
</span><span class="cx">
</span><del>- if WithProperties("%(buildername)s") != "Apple iOS 10 Simulator Release WK2 (Tests)":
- self.setCommand(self.command + ['--no-sample-on-timeout'])
-
</del><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></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205967 => 205968)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-09-15 11:18:08 UTC (rev 205967)
+++ trunk/Tools/ChangeLog 2016-09-15 15:30:00 UTC (rev 205968)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-09-15 Jonathan Bedard <jbedard@apple.com>
+
+ Move --no-sample-on-timeout to config.json for each bot
+ https://bugs.webkit.org/show_bug.cgi?id=161964
+
+ Reviewed by Daniel Bates.
+
+ Roll out changes from 205573 and move them into config.json. At this time, only macOS and iOS simulator sample a process on timeout, —no-sample-on-timeout is unneeded for GTK, EFL and Windows.
+
+ * BuildSlaveSupport/build.webkit.org-config/config.json: Each bot now independently defines if it will be running sample on timeout.
+ * BuildSlaveSupport/build.webkit.org-config/master.cfg:
+ (RunWebKitTests.start): Rolled out changes from 205573.
+
</ins><span class="cx"> 2016-09-15 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> js/stringimpl-to-jsstring-on-large-strings tests consume huge memory
</span></span></pre>
</div>
</div>
</body>
</html>