Clean up the way we determine which env vars to pass to content_shell.

Tools/Scripts/webkitpy/layout_tests/port/base.py

 # Copyright (C) 2010 Google Inc. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
 # met:
 #
 #     * Redistributions of source code must retain the above copyright
 # notice, this list of conditions and the following disclaimer.
 #     * Redistributions in binary form must reproduce the above
 # copyright notice, this list of conditions and the following disclaimer
@@ skipping 851 matching lines @@
             return os.environ[name]
         return default
 
     def _copy_value_from_environ_if_set(self, clean_env, name):
         if name in os.environ:
             clean_env[name] = os.environ[name]
 
     def setup_environ_for_server(self, server_name=None):
         # We intentionally copy only a subset of os.environ when
         # launching subprocesses to ensure consistent test results.
-        clean_env = {}
+        clean_env = {
+            'LOCAL_RESOURCE_ROOT': self.layout_tests_dir(),  # FIXME: Is this used?
+        }
         variables_to_copy = [
-            # For Linux:
-            'XAUTHORITY',
-            'HOME',
-            'LANG',
-            'LD_LIBRARY_PATH',
-            'DBUS_SESSION_BUS_ADDRESS',
-            'XDG_DATA_DIRS',
-
-            # Darwin:
-            'DYLD_LIBRARY_PATH',
-            'HOME',
-
-            # CYGWIN:
-            'HOMEDRIVE',
-            'HOMEPATH',
-            '_NT_SYMBOL_PATH',
-
-            # Windows:
-            'PATH',
-
-            # Most ports (?):
-            'WEBKIT_TESTFONTS',
-            'WEBKITOUTPUTDIR',
-
-            # Chromium:
+            'WEBKIT_TESTFONTS',  # FIXME: Is this still used?
+            'WEBKITOUTPUTDIR',   # FIXME: Is this still used?

[Dirk Pranke, 2013/08/19 21:58:52]

Note that I don't want to actually try and figure out the answer to these FIXME
questions as part of this patch ...

             'CHROME_DEVEL_SANDBOX',
             'CHROME_IPC_LOGGING',
             'ASAN_OPTIONS',
+        ]
+        if self.host.platform.is_linux() or self.host.platform.is_freebsd():
+            variables_to_copy += [
+                'XAUTHORITY',
+                'HOME',
+                'LANG',
+                'LD_LIBRARY_PATH',
+                'DBUS_SESSION_BUS_ADDRESS',
+                'XDG_DATA_DIRS',
+            ]
+            clean_env['DISPLAY'] = self._value_or_default_from_environ('DISPLAY', ':1')
+        if self.host.platform.is_mac():
+            clean_env['DYLD_LIBRARY_PATH'] = self._build_path()
+            clean_env['DYLD_FRAMEWORK_PATH'] = self._build_path()
+            variables_to_copy += [
+                'HOME',
+            ]
+        if self.host.platform.is_win():
+            variables_to_copy += [
+                'PATH',
+            ]
+        if self.host.platform.is_cygwin():
+            variables_to_copy += [
+                'HOMEDRIVE',
+                'HOMEPATH',
+                '_NT_SYMBOL_PATH',
+            ]
 
-        ]
         for variable in variables_to_copy:
             self._copy_value_from_environ_if_set(clean_env, variable)
 
-        # For Linux:
-        clean_env['DISPLAY'] = self._value_or_default_from_environ('DISPLAY', ':1')
-
         for string_variable in self.get_option('additional_env_var', []):
             [name, value] = string_variable.split('=', 1)
             clean_env[name] = value
 
         return clean_env
 
     def show_results_html_file(self, results_filename):
         """This routine should display the HTML file pointed at by
         results_filename in a users' browser."""
         return self.host.user.open_url(path.abspath_to_uri(self.host.platform, results_filename))
@@ skipping 524 matching lines @@
 
 class VirtualTestSuite(object):
     def __init__(self, name, base, args, tests=None):
         self.name = name
         self.base = base
         self.args = args
         self.tests = tests or set()
 
     def __repr__(self):
         return "VirtualTestSuite('%s', '%s', %s)" % (self.name, self.base, self.args)