Changeset 90491 in webkit


Ignore:
Timestamp:
Jul 6, 2011 1:50:46 PM (13 years ago)
Author:
xan@webkit.org
Message:

2011-07-06 Xan Lopez <xlopez@igalia.com>

[GTK] Only set env. variables in start when strictly needed
https://bugs.webkit.org/show_bug.cgi?id=64026

Reviewed by Eric Seidel.

  • Scripts/webkitpy/layout_tests/port/gtk.py: add a setup_environ_for_server method in GtkPort and set as many env. variables as possible there.
Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r90489 r90491  
     12011-07-06  Xan Lopez  <xlopez@igalia.com>
     2
     3        [GTK] Only set env. variables in start when strictly needed
     4        https://bugs.webkit.org/show_bug.cgi?id=64026
     5
     6        Reviewed by Eric Seidel.
     7
     8        * Scripts/webkitpy/layout_tests/port/gtk.py: add a
     9        setup_environ_for_server method in GtkPort and set as many
     10        env. variables as possible there.
     11
    1122011-07-06  Adam Roben  <aroben@apple.com>
    213
  • trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py

    r90474 r90491  
    4545        self._xvfb_process = subprocess.Popen(run_xvfb)
    4646        environment = self._port.setup_environ_for_server()
     47        # We must do this here because the DISPLAY number depends on _worker_number
    4748        environment['DISPLAY'] = ":%d" % (display_id)
    48         environment['GTK_MODULES'] = 'gail'
    49         environment['LIBOVERLAY_SCROLLBAR'] = '0'
    50         environment['WEBKIT_INSPECTOR_PATH'] = self._port._build_path('Programs/resources/inspector')
    5149        self._server_process = server_process.ServerProcess(self._port,
    5250            self._port.driver_name(), self.cmd_line(), environment)
     
    6361    def create_driver(self, worker_number):
    6462        return GtkDriver(self, worker_number)
     63
     64    def setup_environ_for_server(self):
     65        environment = webkit.WebKitPort.setup_environ_for_server(self)
     66        environment['GTK_MODULES'] = 'gail'
     67        environment['LIBOVERLAY_SCROLLBAR'] = '0'
     68        environment['WEBKIT_INSPECTOR_PATH'] = self._build_path('Programs/resources/inspector')
     69
     70        return environment
    6571
    6672    def _path_to_apache_config_file(self):
Note: See TracChangeset for help on using the changeset viewer.