Title: [196048] trunk/Tools
- Revision
- 196048
- Author
- [email protected]
- Date
- 2016-02-02 22:14:12 -0800 (Tue, 02 Feb 2016)
Log 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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (196047 => 196048)
--- trunk/Tools/ChangeLog 2016-02-03 06:06:59 UTC (rev 196047)
+++ trunk/Tools/ChangeLog 2016-02-03 06:14:12 UTC (rev 196048)
@@ -1,5 +1,30 @@
2016-02-02 Dan Bernstein <[email protected]>
+ 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.
+
+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
Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (196047 => 196048)
--- trunk/Tools/Scripts/webkitpy/port/driver.py 2016-02-03 06:06:59 UTC (rev 196047)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2016-02-03 06:14:12 UTC (rev 196048)
@@ -321,7 +321,6 @@
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 (196047 => 196048)
--- trunk/Tools/Scripts/webkitpy/port/ios.py 2016-02-03 06:06:59 UTC (rev 196047)
+++ trunk/Tools/Scripts/webkitpy/port/ios.py 2016-02-03 06:14:12 UTC (rev 196048)
@@ -271,9 +271,7 @@
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"))
- # work around missing /etc/catalog <rdar://problem/4292995>
- env['XML_CATALOG_FILES'] = ''
- env['__XPC_XML_CATALOG_FILES'] = ''
+ env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
return env
def operating_system(self):
Modified: trunk/Tools/Scripts/webkitpy/port/mac.py (196047 => 196048)
--- trunk/Tools/Scripts/webkitpy/port/mac.py 2016-02-03 06:06:59 UTC (rev 196047)
+++ trunk/Tools/Scripts/webkitpy/port/mac.py 2016-02-03 06:14:12 UTC (rev 196048)
@@ -106,9 +106,7 @@
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"))
- # work around missing /etc/catalog <rdar://problem/4292995>
- env['XML_CATALOG_FILES'] = ''
- env['__XPC_XML_CATALOG_FILES'] = ''
+ env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995>
return env
def _clear_global_caches_and_temporary_files(self):
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm (196047 => 196048)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm 2016-02-03 06:06:59 UTC (rev 196047)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/ios/InjectedBundleIOS.mm 2016-02-03 06:14:12 UTC (rev 196048)
@@ -35,6 +35,9 @@
void InjectedBundle::platformInitialize(WKTypeRef)
{
+ // Work around missing /etc/catalog <rdar://problem/4292995>.
+ setenv("XML_CATALOG_FILES", "", 0);
+
// Language was set up earlier in main(). Don't clobber it.
NSArray *languages = [[[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain] valueForKey:@"AppleLanguages"];
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (196047 => 196048)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2016-02-03 06:06:59 UTC (rev 196047)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2016-02-03 06:14:12 UTC (rev 196048)
@@ -42,6 +42,9 @@
static const int NoFontSmoothing = 0;
static const int BlueTintedAppearance = 1;
+ // Work around missing /etc/catalog <rdar://problem/4292995>.
+ setenv("XML_CATALOG_FILES", "", 0);
+
// Language was set up earlier in main(). Don't clobber it.
NSArray *languages = [[[NSUserDefaults standardUserDefaults] volatileDomainForName:NSArgumentDomain] valueForKey:@"AppleLanguages"];
if (!languages)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
