Changeset 182481 in webkit
- Timestamp:
- Apr 7, 2015 11:06:54 AM (9 years ago)
- Location:
- trunk/Tools
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r182476 r182481 1 2015-04-07 Brent Fulgham <bfulgham@apple.com> 2 3 [Win] Bots complain about missing /etc/catalog 4 https://bugs.webkit.org/show_bug.cgi?id=143484 5 6 Reviewed by Chris Dumez. 7 8 The libxml2 build on Mac, iOS, and Windows does not provide the set 9 of default catalog files. We do not actually need these for our 10 purposes, but we get warnings and some bot flakiness because they 11 are not present. 12 13 We can avoid both problems the same way the Mac and iOS ports do, 14 by setting the XML_CATALOG_FILES environment variable to 'empty string', 15 which avoid the warnings and bot problems. 16 17 * Scripts/webkitpy/port/win.py: 18 (WinPort.setup_environ_for_server): Added. 19 1 20 2015-04-06 Sam Weinig <sam@webkit.org> 2 21 -
trunk/Tools/Scripts/webkitpy/port/win.py
r180240 r182481 1 1 # Copyright (C) 2010 Google Inc. All rights reserved. 2 # Copyright (C) 2013 Apple Inc. All rights reserved.2 # Copyright (C) 2013, 2015 Apple Inc. All rights reserved. 3 3 # 4 4 # Redistribution and use in source and binary forms, with or without … … 91 91 return map(self._webkit_baseline_path, fallback_names) 92 92 93 def setup_environ_for_server(self, server_name=None): 94 env = super(WinPort, self).setup_environ_for_server(server_name) 95 env['XML_CATALOG_FILES'] = '' # work around missing /etc/catalog <rdar://problem/4292995> 96 return env 97 93 98 def operating_system(self): 94 99 return 'win'
Note: See TracChangeset
for help on using the changeset viewer.