[Win] Bots complain about missing /etc/catalog

https://bugs.webkit.org/show_bug.cgi?id=143484

Reviewed by Chris Dumez.

The libxml2 build on Mac, iOS, and Windows does not provide the set
of default catalog files. We do not actually need these for our
purposes, but we get warnings and some bot flakiness because they
are not present.

We can avoid both problems the same way the Mac and iOS ports do,
by setting the XML_CATALOG_FILES environment variable to 'empty string',
which avoid the warnings and bot problems.

* Scripts/webkitpy/port/win.py:
(WinPort.setup_environ_for_server): Added.

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

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 980fb58de7a8fd7916d90458260a9af03443601a..9c6751d061056a57015f19900bf1b0475070114a 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,22 @@
+2015-04-07  Brent Fulgham  <bfulgham@apple.com>
+
+        [Win] Bots complain about missing /etc/catalog
+        https://bugs.webkit.org/show_bug.cgi?id=143484
+
+        Reviewed by Chris Dumez.
+
+        The libxml2 build on Mac, iOS, and Windows does not provide the set
+        of default catalog files. We do not actually need these for our
+        purposes, but we get warnings and some bot flakiness because they
+        are not present.
+
+        We can avoid both problems the same way the Mac and iOS ports do,
+        by setting the XML_CATALOG_FILES environment variable to 'empty string',
+        which avoid the warnings and bot problems.
+
+        * Scripts/webkitpy/port/win.py:
+        (WinPort.setup_environ_for_server): Added.
+
 2015-04-06  Sam Weinig  <sam@webkit.org>
 
         Use content extensions in MiniBrowser.

diff --git a/Tools/Scripts/webkitpy/port/win.py b/Tools/Scripts/webkitpy/port/win.py
index f84e9c9890f374ea9fade7e217d073a26fdc770d..3a3f31c9092f9c06b57a072071e066bf6fe0377f 100644 (file)
--- a/Tools/Scripts/webkitpy/port/win.py
+++ b/Tools/Scripts/webkitpy/port/win.py
@@ -1,5 +1,5 @@
 # Copyright (C) 2010 Google Inc. All rights reserved.
-# Copyright (C) 2013 Apple Inc. All rights reserved.
+# Copyright (C) 2013, 2015 Apple Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -90,6 +90,11 @@ class WinPort(ApplePort):
         fallback_names.append('mac')
         return map(self._webkit_baseline_path, fallback_names)
 
+    def setup_environ_for_server(self, server_name=None):
+        env = super(WinPort, self).setup_environ_for_server(server_name)
+        env['XML_CATALOG_FILES'] = ''  # work around missing /etc/catalog <rdar://problem/4292995>
+        return env
+
     def operating_system(self):
         return 'win'