<!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>[192461] trunk/LayoutTests</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/192461">192461</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-11-15 08:01:49 -0800 (Sun, 15 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebKit should not need to modify testharness.js
https://bugs.webkit.org/show_bug.cgi?id=151262
Reviewed by Darin Adler.
* resources/testharness.js: Resetting global testharness.js timeout values to the default ones.
* resources/testharnessreport.js: Disabling global testharness.js timeout.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsresourcestestharnessjs">trunk/LayoutTests/resources/testharness.js</a></li>
<li><a href="#trunkLayoutTestsresourcestestharnessreportjs">trunk/LayoutTests/resources/testharnessreport.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (192460 => 192461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-11-15 08:42:34 UTC (rev 192460)
+++ trunk/LayoutTests/ChangeLog        2015-11-15 16:01:49 UTC (rev 192461)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-11-15 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ WebKit should not need to modify testharness.js
+ https://bugs.webkit.org/show_bug.cgi?id=151262
+
+ Reviewed by Darin Adler.
+
+ * resources/testharness.js: Resetting global testharness.js timeout values to the default ones.
+ * resources/testharnessreport.js: Disabling global testharness.js timeout.
+
</ins><span class="cx"> 2015-11-14 Michael Saboff <msaboff@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r190370): CrashTracer: [USER] com.apple.WebKit.WebContent at com.apple.JavaScriptCore: JSC::JITCode::execute + 158
</span></span></pre></div>
<a id="trunkLayoutTestsresourcestestharnessjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/resources/testharness.js (192460 => 192461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/resources/testharness.js        2015-11-15 08:42:34 UTC (rev 192460)
+++ trunk/LayoutTests/resources/testharness.js        2015-11-15 16:01:49 UTC (rev 192461)
</span><span class="lines">@@ -15,13 +15,13 @@
</span><span class="cx"> (function ()
</span><span class="cx"> {
</span><span class="cx"> var debug = false;
</span><del>- // For WebKit, we set harness timeout to a very large value, expecting run-webkit-tests
- // to enforce the right one.
</del><ins>+
+ // default timeout is 10 seconds, test can override if needed
</ins><span class="cx"> var settings = {
</span><span class="cx"> output:false,
</span><span class="cx"> harness_timeout:{
</span><del>- "normal":1000000,
- "long":1000000
</del><ins>+ "normal":10000,
+ "long":60000
</ins><span class="cx"> },
</span><span class="cx"> test_timeout:null,
</span><span class="cx"> message_events: ["start", "test_state", "result", "completion"]
</span></span></pre></div>
<a id="trunkLayoutTestsresourcestestharnessreportjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/resources/testharnessreport.js (192460 => 192461)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/resources/testharnessreport.js        2015-11-15 08:42:34 UTC (rev 192460)
+++ trunk/LayoutTests/resources/testharnessreport.js        2015-11-15 16:01:49 UTC (rev 192461)
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> * spacing between cells is preserved, and it is therefore not readable. By
</span><span class="cx"> * setting output to false, the HTML table will not be created
</span><span class="cx"> */
</span><del>-setup({"output":false});
</del><ins>+setup({"output":false, "explicit_timeout": true});
</ins><span class="cx">
</span><span class="cx"> /* Using a callback function, test results will be added to the page in a
</span><span class="cx"> * manner that allows dumpAsText to produce readable test results
</span></span></pre>
</div>
</div>
</body>
</html>