<!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>[182268] 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/182268">182268</a></dd>
<dt>Author</dt> <dd>ap@apple.com</dd>
<dt>Date</dt> <dd>2015-04-01 23:28:24 -0700 (Wed, 01 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>When LayoutTestHelper fails to start, we continue to run the tests, ending up with mysterious failures
https://bugs.webkit.org/show_bug.cgi?id=143240
rdar://problem/19990425
Reviewed by Tim Horton.
* DumpRenderTree/mac/LayoutTestHelper.m:
(colorProfileURLForDisplay):
(saveDisplayColorProfiles):
Gracefully handle it when the current profile cannot be retrieved, fixing at
least one case when LayoutTestHelper couldn't start.
* Scripts/webkitpy/layout_tests/controllers/manager.py:
(Manager._set_up_run):
(Manager._force_pixel_tests_if_needed):
* Scripts/webkitpy/port/base.py: (Port.to.start_helper):
* Scripts/webkitpy/port/mac.py: (MacPort.start_helper):
Return and check an error from start_helper().</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacLayoutTestHelperm">trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m</a></li>
<li><a href="#trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy">trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportmacpy">trunk/Tools/Scripts/webkitpy/port/mac.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (182267 => 182268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-02 05:58:20 UTC (rev 182267)
+++ trunk/Tools/ChangeLog 2015-04-02 06:28:24 UTC (rev 182268)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2015-04-01 Alexey Proskuryakov <ap@apple.com>
+
+ When LayoutTestHelper fails to start, we continue to run the tests, ending up with mysterious failures
+ https://bugs.webkit.org/show_bug.cgi?id=143240
+ rdar://problem/19990425
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/LayoutTestHelper.m:
+ (colorProfileURLForDisplay):
+ (saveDisplayColorProfiles):
+ Gracefully handle it when the current profile cannot be retrieved, fixing at
+ least one case when LayoutTestHelper couldn't start.
+
+ * Scripts/webkitpy/layout_tests/controllers/manager.py:
+ (Manager._set_up_run):
+ (Manager._force_pixel_tests_if_needed):
+ * Scripts/webkitpy/port/base.py: (Port.to.start_helper):
+ * Scripts/webkitpy/port/mac.py: (MacPort.start_helper):
+ Return and check an error from start_helper().
+
</ins><span class="cx"> 2015-04-01 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Run test-webkitpy as part of EWS (just like we do on other platforms)
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacLayoutTestHelperm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m (182267 => 182268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2015-04-02 05:58:20 UTC (rev 182267)
+++ trunk/Tools/DumpRenderTree/mac/LayoutTestHelper.m 2015-04-02 06:28:24 UTC (rev 182268)
</span><span class="lines">@@ -73,7 +73,12 @@
</span><span class="cx"> profileURL = (CFURLRef)CFDictionaryGetValue(factoryProfile, kColorSyncDeviceProfileURL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-
</del><ins>+ if (!profileURL) {
+ NSLog(@"Could not determine current color profile, so it will not be reset after running the tests.");
+ CFRelease(deviceInfo);
+ return nil;
+ }
+
</ins><span class="cx"> NSURL *url = (NSURL *)CFAutorelease(CFRetain(profileURL));
</span><span class="cx"> CFRelease(deviceInfo);
</span><span class="cx"> return url;
</span><span class="lines">@@ -116,6 +121,9 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> NSURL *colorProfileURL = colorProfileURLForDisplay(UUIDString);
</span><ins>+ if (!colorProfileURL)
+ continue;
+
</ins><span class="cx"> [userColorProfiles setObject:colorProfileURL forKey:UUIDString];
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpylayout_testscontrollersmanagerpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py (182267 => 182268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2015-04-02 05:58:20 UTC (rev 182267)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py 2015-04-02 06:28:24 UTC (rev 182268)
</span><span class="lines">@@ -142,7 +142,8 @@
</span><span class="cx"> # This must be started before we check the system dependencies,
</span><span class="cx"> # since the helper may do things to make the setup correct.
</span><span class="cx"> self._printer.write_update("Starting helper ...")
</span><del>- self._port.start_helper(self._options.pixel_tests)
</del><ins>+ if not self._port.start_helper(self._options.pixel_tests):
+ return False
</ins><span class="cx">
</span><span class="cx"> self._port.reset_preferences()
</span><span class="cx">
</span><span class="lines">@@ -267,10 +268,8 @@
</span><span class="cx"> _log.debug("Restarting helper")
</span><span class="cx"> self._port.stop_helper()
</span><span class="cx"> self._options.pixel_tests = True
</span><del>- self._port.start_helper()
</del><ins>+ return self._port.start_helper()
</ins><span class="cx">
</span><del>- return True
-
</del><span class="cx"> def _look_for_new_crash_logs(self, run_results, start_time):
</span><span class="cx"> """Since crash logs can take a long time to be written out if the system is
</span><span class="cx"> under stress do a second pass at the end of the test run.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (182267 => 182268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2015-04-02 05:58:20 UTC (rev 182267)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2015-04-02 06:28:24 UTC (rev 182268)
</span><span class="lines">@@ -866,7 +866,7 @@
</span><span class="cx"> """If a port needs to reconfigure graphics settings or do other
</span><span class="cx"> things to ensure a known test configuration, it should override this
</span><span class="cx"> method."""
</span><del>- pass
</del><ins>+ return True
</ins><span class="cx">
</span><span class="cx"> def reset_preferences(self):
</span><span class="cx"> """If a port needs to reset platform-specific persistent preference
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (182267 => 182268)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py 2015-04-02 05:58:20 UTC (rev 182267)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2015-04-02 06:28:24 UTC (rev 182268)
</span><span class="lines">@@ -258,14 +258,18 @@
</span><span class="cx">
</span><span class="cx"> def start_helper(self, pixel_tests=False):
</span><span class="cx"> helper_path = self._path_to_helper()
</span><del>- if helper_path:
- _log.debug("Starting layout helper %s" % helper_path)
- arguments = [helper_path, '--install-color-profile']
- self._helper = self._executive.popen(arguments,
- stdin=self._executive.PIPE, stdout=self._executive.PIPE, stderr=None)
- is_ready = self._helper.stdout.readline()
- if not is_ready.startswith('ready'):
- _log.error("LayoutTestHelper failed to be ready")
</del><ins>+ if not helper_path:
+ _log.error("No path to LayoutTestHelper binary")
+ return False
+ _log.debug("Starting layout helper %s" % helper_path)
+ arguments = [helper_path, '--install-color-profile']
+ self._helper = self._executive.popen(arguments,
+ stdin=self._executive.PIPE, stdout=self._executive.PIPE, stderr=None)
+ is_ready = self._helper.stdout.readline()
+ if not is_ready.startswith('ready'):
+ _log.error("LayoutTestHelper could not start")
+ return False
+ return True
</ins><span class="cx">
</span><span class="cx"> def reset_preferences(self):
</span><span class="cx"> _log.debug("Resetting persistent preferences")
</span></span></pre>
</div>
</div>
</body>
</html>