Title: [196013] trunk
- Revision
- 196013
- Author
- [email protected]
- Date
- 2016-02-02 10:06:51 -0800 (Tue, 02 Feb 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (196012 => 196013)
--- trunk/LayoutTests/ChangeLog 2016-02-02 17:57:40 UTC (rev 196012)
+++ trunk/LayoutTests/ChangeLog 2016-02-02 18:06:51 UTC (rev 196013)
@@ -1,3 +1,12 @@
+2016-02-02 Dan Bernstein <[email protected]>
+
+ 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.
+
2016-02-02 Eric Carlson <[email protected]>
Allow ports to disable automatic text track selection
Modified: trunk/LayoutTests/platform/mac/TestExpectations (196012 => 196013)
--- 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)
@@ -1312,6 +1312,4 @@
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 ]
-webkit.org/b/153683 [ ElCapitan ] fast/parser/external-entities-in-xslt.xml [ Pass Failure ]
-
webkit.org/b/153752 [ Yosemite ] http/tests/plugins/visible_plugins.html [ Skip ]
Modified: trunk/Tools/ChangeLog (196012 => 196013)
--- trunk/Tools/ChangeLog 2016-02-02 17:57:40 UTC (rev 196012)
+++ trunk/Tools/ChangeLog 2016-02-02 18:06:51 UTC (rev 196013)
@@ -1,3 +1,19 @@
+2016-02-02 Dan Bernstein <[email protected]>
+
+ 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.
+
2016-01-29 Grzegorz Czajkowski <[email protected]>
[EFL] Virtual Keyboard overlaps MiniBrowser's WebView
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (196012 => 196013)
--- 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)
@@ -321,6 +321,7 @@
environment['DIRHELPER_USER_DIR_SUFFIX'] = str(os.path.basename(str(self._driver_tempdir)))
# Put certain normally persistent files into the temp directory (e.g. IndexedDB storage).
environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
+ environment['__XPC_DUMPRENDERTREE_TEMP'] = environment['DUMPRENDERTREE_TEMP']
environment['LOCAL_RESOURCE_ROOT'] = str(self._port.layout_tests_dir())
environment['ASAN_OPTIONS'] = "allocator_may_return_null=1"
environment['__XPC_ASAN_OPTIONS'] = environment['ASAN_OPTIONS']
Modified: trunk/Tools/Scripts/webkitpy/port/ios.py (196012 => 196013)
--- 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)
@@ -271,7 +271,9 @@
self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
- env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
+ # work around missing /etc/catalog <rdar://problem/4292995>
+ env['XML_CATALOG_FILES'] = ''
+ env['__XPC_XML_CATALOG_FILES'] = ''
return env
def operating_system(self):
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (196012 => 196013)
--- 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)
@@ -106,7 +106,9 @@
self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
- env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
+ # work around missing /etc/catalog <rdar://problem/4292995>
+ env['XML_CATALOG_FILES'] = ''
+ env['__XPC_XML_CATALOG_FILES'] = ''
return env
def _clear_global_caches_and_temporary_files(self):
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
