<!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>[196013] trunk</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/196013">196013</a></dd>
<dt>Author</dt> <dd>mitz@apple.com</dd>
<dt>Date</dt> <dd>2016-02-02 10:06:51 -0800 (Tue, 02 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Layout Test fast/parser/external-entities-in-xslt.xml is flaky on El Capitan (but fails most of the time)
https://bugs.webkit.org/show_bug.cgi?id=153683
Reviewed by Alexey Proskuryakov.
Tools:
Ensure that XML_CATALOG_FILES is set in the Web Content service’s environment as well.
* Scripts/webkitpy/port/driver.py:
(Driver._setup_environ_for_driver): Also set __XPC_DUMPRENDERTREE_TEMP.
* Scripts/webkitpy/port/ios.py:
(IOSSimulatorPort.setup_environ_for_server): Set __XPC_XML_CATALOG_FILES.
* Scripts/webkitpy/port/mac.py:
(MacPort.setup_environ_for_server): Ditto.
LayoutTests:
* platform/mac/TestExpectations: Removed the failure expectation for this test.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportiospy">trunk/Tools/Scripts/webkitpy/port/ios.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="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (196012 => 196013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-02-02 17:57:40 UTC (rev 196012)
+++ trunk/LayoutTests/ChangeLog 2016-02-02 18:06:51 UTC (rev 196013)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-02-02 Dan Bernstein <mitz@apple.com>
+
+ Layout Test fast/parser/external-entities-in-xslt.xml is flaky on El Capitan (but fails most of the time)
+ https://bugs.webkit.org/show_bug.cgi?id=153683
+
+ Reviewed by Alexey Proskuryakov.
+
+ * platform/mac/TestExpectations: Removed the failure expectation for this test.
+
</ins><span class="cx"> 2016-02-02 Eric Carlson <eric.carlson@apple.com>
</span><span class="cx">
</span><span class="cx"> Allow ports to disable automatic text track selection
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (196012 => 196013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-02-02 17:57:40 UTC (rev 196012)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-02-02 18:06:51 UTC (rev 196013)
</span><span class="lines">@@ -1312,6 +1312,4 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/153086 sputnik/Conformance/15_Native_Objects/15.1_The_Global_Object/15.1.3/15.1.3.3_encodeURI/S15.1.3.3_A2.4_T2.html [ Pass Crash ]
</span><span class="cx">
</span><del>-webkit.org/b/153683 [ ElCapitan ] fast/parser/external-entities-in-xslt.xml [ Pass Failure ]
-
</del><span class="cx"> webkit.org/b/153752 [ Yosemite ] http/tests/plugins/visible_plugins.html [ Skip ]
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (196012 => 196013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-02-02 17:57:40 UTC (rev 196012)
+++ trunk/Tools/ChangeLog 2016-02-02 18:06:51 UTC (rev 196013)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-02-02 Dan Bernstein <mitz@apple.com>
+
+ Layout Test fast/parser/external-entities-in-xslt.xml is flaky on El Capitan (but fails most of the time)
+ https://bugs.webkit.org/show_bug.cgi?id=153683
+
+ Reviewed by Alexey Proskuryakov.
+
+ Ensure that XML_CATALOG_FILES is set in the Web Content service’s environment as well.
+
+ * Scripts/webkitpy/port/driver.py:
+ (Driver._setup_environ_for_driver): Also set __XPC_DUMPRENDERTREE_TEMP.
+ * Scripts/webkitpy/port/ios.py:
+ (IOSSimulatorPort.setup_environ_for_server): Set __XPC_XML_CATALOG_FILES.
+ * Scripts/webkitpy/port/mac.py:
+ (MacPort.setup_environ_for_server): Ditto.
+
</ins><span class="cx"> 2016-01-29 Grzegorz Czajkowski <g.czajkowski@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Virtual Keyboard overlaps MiniBrowser's WebView
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (196012 => 196013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2016-02-02 17:57:40 UTC (rev 196012)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2016-02-02 18:06:51 UTC (rev 196013)
</span><span class="lines">@@ -321,6 +321,7 @@
</span><span class="cx"> environment['DIRHELPER_USER_DIR_SUFFIX'] = str(os.path.basename(str(self._driver_tempdir)))
</span><span class="cx"> # Put certain normally persistent files into the temp directory (e.g. IndexedDB storage).
</span><span class="cx"> environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
</span><ins>+ environment['__XPC_DUMPRENDERTREE_TEMP'] = environment['DUMPRENDERTREE_TEMP']
</ins><span class="cx"> environment['LOCAL_RESOURCE_ROOT'] = str(self._port.layout_tests_dir())
</span><span class="cx"> environment['ASAN_OPTIONS'] = "allocator_may_return_null=1"
</span><span class="cx"> environment['__XPC_ASAN_OPTIONS'] = environment['ASAN_OPTIONS']
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportiospy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (196012 => 196013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/ios.py 2016-02-02 17:57:40 UTC (rev 196012)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2016-02-02 18:06:51 UTC (rev 196013)
</span><span class="lines">@@ -271,7 +271,9 @@
</span><span class="cx"> self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
</span><span class="cx"> self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
</span><span class="cx"> self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
</span><del>- env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
</del><ins>+ # work around missing /etc/catalog <rdar://problem/4292995>
+ env['XML_CATALOG_FILES'] = ''
+ env['__XPC_XML_CATALOG_FILES'] = ''
</ins><span class="cx"> return env
</span><span class="cx">
</span><span class="cx"> def operating_system(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportmacpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (196012 => 196013)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/mac.py 2016-02-02 17:57:40 UTC (rev 196012)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2016-02-02 18:06:51 UTC (rev 196013)
</span><span class="lines">@@ -106,7 +106,9 @@
</span><span class="cx"> self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
</span><span class="cx"> self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
</span><span class="cx"> self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
</span><del>- env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
</del><ins>+ # work around missing /etc/catalog <rdar://problem/4292995>
+ env['XML_CATALOG_FILES'] = ''
+ env['__XPC_XML_CATALOG_FILES'] = ''
</ins><span class="cx"> return env
</span><span class="cx">
</span><span class="cx"> def _clear_global_caches_and_temporary_files(self):
</span></span></pre>
</div>
</div>
</body>
</html>