Layout Test fast/parser/external-entities-in-xslt.xml is flaky on El Capitan (but...
authormitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Feb 2016 18:06:51 +0000 (18:06 +0000)
committermitz@apple.com <mitz@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Feb 2016 18:06:51 +0000 (18:06 +0000)
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.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@196013 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/platform/mac/TestExpectations
Tools/ChangeLog
Tools/Scripts/webkitpy/port/driver.py
Tools/Scripts/webkitpy/port/ios.py
Tools/Scripts/webkitpy/port/mac.py

index f5478d3..01dd5d3 100644 (file)
@@ -1,3 +1,12 @@
+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.
+
 2016-02-02  Eric Carlson  <eric.carlson@apple.com>
 
         Allow ports to disable automatic text track selection
index acb8d9c..d7b3624 100644 (file)
@@ -1312,6 +1312,4 @@ webkit.org/b/152009 [ Debug ElCapitan ] fast/canvas/canvas-too-large-to-draw.htm
 
 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 ]
index 58a9b45..96ee8c5 100644 (file)
@@ -1,3 +1,19 @@
+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.
+
 2016-01-29 Grzegorz Czajkowski  <g.czajkowski@samsung.com>
 
         [EFL] Virtual Keyboard overlaps MiniBrowser's WebView
index 44a745e..e369ee4 100644 (file)
@@ -321,6 +321,7 @@ class Driver(object):
         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']
index d33bb2c..2a822a7 100644 (file)
@@ -271,7 +271,9 @@ class IOSSimulatorPort(Port):
                 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):
index f5bb9d7..a7f9fba 100644 (file)
@@ -106,7 +106,9 @@ class MacPort(ApplePort):
                 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):