Changeset 196013 in webkit


Ignore:
Timestamp:
Feb 2, 2016 10:06:51 AM (8 years ago)
Author:
mitz@apple.com
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.
Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r196010 r196013  
     12016-02-02  Dan Bernstein  <mitz@apple.com>
     2
     3        Layout Test fast/parser/external-entities-in-xslt.xml is flaky on El Capitan (but fails most of the time)
     4        https://bugs.webkit.org/show_bug.cgi?id=153683
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        * platform/mac/TestExpectations: Removed the failure expectation for this test.
     9
    1102016-02-02  Eric Carlson  <eric.carlson@apple.com>
    211

  • trunk/LayoutTests/platform/mac/TestExpectations

    r195996 r196013  
    13131313webkit.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 ]
    13141314
    1315 webkit.org/b/153683 [ ElCapitan ] fast/parser/external-entities-in-xslt.xml [ Pass Failure ]
    1316 
    13171315webkit.org/b/153752 [ Yosemite ] http/tests/plugins/visible_plugins.html [ Skip ]

  • trunk/Tools/ChangeLog

    r196007 r196013  
     12016-02-02  Dan Bernstein  <mitz@apple.com>
     2
     3        Layout Test fast/parser/external-entities-in-xslt.xml is flaky on El Capitan (but fails most of the time)
     4        https://bugs.webkit.org/show_bug.cgi?id=153683
     5
     6        Reviewed by Alexey Proskuryakov.
     7
     8        Ensure that XML_CATALOG_FILES is set in the Web Content service’s environment as well.
     9
     10        * Scripts/webkitpy/port/driver.py:
     11        (Driver._setup_environ_for_driver): Also set __XPC_DUMPRENDERTREE_TEMP.
     12        * Scripts/webkitpy/port/ios.py:
     13        (IOSSimulatorPort.setup_environ_for_server): Set __XPC_XML_CATALOG_FILES.
     14        * Scripts/webkitpy/port/mac.py:
     15        (MacPort.setup_environ_for_server): Ditto.
     16
    1172016-01-29 Grzegorz Czajkowski  <g.czajkowski@samsung.com>
    218

  • trunk/Tools/Scripts/webkitpy/port/driver.py

    r195795 r196013  
    322322        # Put certain normally persistent files into the temp directory (e.g. IndexedDB storage).
    323323        environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
     324        environment['__XPC_DUMPRENDERTREE_TEMP'] = environment['DUMPRENDERTREE_TEMP']
    324325        environment['LOCAL_RESOURCE_ROOT'] = str(self._port.layout_tests_dir())
    325326        environment['ASAN_OPTIONS'] = "allocator_may_return_null=1"

  • trunk/Tools/Scripts/webkitpy/port/ios.py

    r195795 r196013  
    272272                self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
    273273            self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
    274         env['XML_CATALOG_FILES'] = ''  # work around missing /etc/catalog <rdar://problem/4292995>
     274        # work around missing /etc/catalog <rdar://problem/4292995>
     275        env['XML_CATALOG_FILES'] = ''
     276        env['__XPC_XML_CATALOG_FILES'] = ''
    275277        return env
    276278

  • trunk/Tools/Scripts/webkitpy/port/mac.py

    r195795 r196013  
    107107                self._append_value_colon_separated(env, '__XPC_DYLD_INSERT_LIBRARIES', '/usr/lib/libgmalloc.dylib')
    108108            self._append_value_colon_separated(env, 'DYLD_INSERT_LIBRARIES', self._build_path("libWebCoreTestShim.dylib"))
    109         env['XML_CATALOG_FILES'] = ''  # work around missing /etc/catalog <rdar://problem/4292995>
     109        # work around missing /etc/catalog <rdar://problem/4292995>
     110        env['XML_CATALOG_FILES'] = ''
     111        env['__XPC_XML_CATALOG_FILES'] = ''
    110112        return env
    111113
Note: See TracChangeset for help on using the changeset viewer.