Changeset 196048 in webkit


Ignore:
Timestamp:
Feb 2, 2016 10:14:12 PM (8 years ago)
Author:
mitz@apple.com
Message:

Better fix for 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 Darin Adler.

  • Scripts/webkitpy/port/driver.py:

(Driver._setup_environ_for_driver): Reverted change from r196013. DUMPRENDERTREE_TEMP is not

used by any code in the Web Content process. If that ever changed, we should send it over
as a bundle parameter.

  • Scripts/webkitpy/port/ios.py:

(IOSSimulatorPort.setup_environ_for_server): Reverted change from r196013.

  • Scripts/webkitpy/port/mac.py:

(MacPort.setup_environ_for_server): Ditto.

  • WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm:

(WTR::InjectedBundle::platformInitialize): Set XML_CATALOG_FILES in the Web Process

environment. This is early enough that libxml2 has not been initialized yet.

  • WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:

(WTR::InjectedBundle::platformInitialize): Ditto.

Location:
trunk/Tools
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/Tools/ChangeLog

    r196013 r196048  
     12016-02-02  Dan Bernstein  <mitz@apple.com>
     2
     3        Better fix for 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 Darin Adler.
     7
     8        * Scripts/webkitpy/port/driver.py:
     9        (Driver._setup_environ_for_driver): Reverted change from r196013. DUMPRENDERTREE_TEMP is not
     10          used by any code in the Web Content process. If that ever changed, we should send it over
     11          as a bundle parameter.
     12
     13        * Scripts/webkitpy/port/ios.py:
     14        (IOSSimulatorPort.setup_environ_for_server): Reverted change from r196013.
     15
     16        * Scripts/webkitpy/port/mac.py:
     17        (MacPort.setup_environ_for_server): Ditto.
     18
     19        * WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm:
     20        (WTR::InjectedBundle::platformInitialize): Set XML_CATALOG_FILES in the Web Process
     21          environment. This is early enough that libxml2 has not been initialized yet.
     22
     23        * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm:
     24        (WTR::InjectedBundle::platformInitialize): Ditto.
     25
    1262016-02-02  Dan Bernstein  <mitz@apple.com>
    227

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

    r196013 r196048  
    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']
    325324        environment['LOCAL_RESOURCE_ROOT'] = str(self._port.layout_tests_dir())
    326325        environment['ASAN_OPTIONS'] = "allocator_may_return_null=1"

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

    r196013 r196048  
    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         # work around missing /etc/catalog <rdar://problem/4292995>
    275         env['XML_CATALOG_FILES'] = ''
    276         env['__XPC_XML_CATALOG_FILES'] = ''
     274        env['XML_CATALOG_FILES'] = ''  # work around missing /etc/catalog <rdar://problem/4292995>
    277275        return env
    278276

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

    r196013 r196048  
    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         # work around missing /etc/catalog <rdar://problem/4292995>
    110         env['XML_CATALOG_FILES'] = ''
    111         env['__XPC_XML_CATALOG_FILES'] = ''
     109        env['XML_CATALOG_FILES'] = ''  # work around missing /etc/catalog <rdar://problem/4292995>
    112110        return env
    113111

  • trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm

    r189768 r196048  
    3636void InjectedBundle::platformInitialize(WKTypeRef)
    3737{
     38    // Work around missing /etc/catalog <rdar://problem/4292995>.
     39    setenv("XML_CATALOG_FILES", "", 0);
     40
    3841    // Language was set up earlier in main(). Don't clobber it.
    3942    NSArray *languages = [[[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain] valueForKey:@"AppleLanguages"];

  • trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm

    r192598 r196048  
    4242    static const int NoFontSmoothing = 0;
    4343    static const int BlueTintedAppearance = 1;
     44
     45    // Work around missing /etc/catalog <rdar://problem/4292995>.
     46    setenv("XML_CATALOG_FILES", "", 0);
    4447
    4548    // Language was set up earlier in main(). Don't clobber it.
Note: See TracChangeset for help on using the changeset viewer.