Title: [90491] trunk/Tools
- Revision
- 90491
- Author
- x...@webkit.org
- Date
- 2011-07-06 13:50:46 -0700 (Wed, 06 Jul 2011)
Log Message
2011-07-06 Xan Lopez <xlo...@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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90490 => 90491)
--- trunk/Tools/ChangeLog 2011-07-06 20:49:21 UTC (rev 90490)
+++ trunk/Tools/ChangeLog 2011-07-06 20:50:46 UTC (rev 90491)
@@ -1,3 +1,14 @@
+2011-07-06 Xan Lopez <xlo...@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.
+
2011-07-06 Adam Roben <aro...@apple.com>
Teach TestFailures how to load, parse, and interpret NRWT test results
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (90490 => 90491)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-07-06 20:49:21 UTC (rev 90490)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2011-07-06 20:50:46 UTC (rev 90491)
@@ -44,10 +44,8 @@
run_xvfb = ["Xvfb", ":%d" % (display_id), "-screen", "0", "800x600x24", "-nolisten", "tcp"]
self._xvfb_process = subprocess.Popen(run_xvfb)
environment = self._port.setup_environ_for_server()
+ # We must do this here because the DISPLAY number depends on _worker_number
environment['DISPLAY'] = ":%d" % (display_id)
- environment['GTK_MODULES'] = 'gail'
- environment['LIBOVERLAY_SCROLLBAR'] = '0'
- environment['WEBKIT_INSPECTOR_PATH'] = self._port._build_path('Programs/resources/inspector')
self._server_process = server_process.ServerProcess(self._port,
self._port.driver_name(), self.cmd_line(), environment)
@@ -63,6 +61,14 @@
def create_driver(self, worker_number):
return GtkDriver(self, worker_number)
+ def setup_environ_for_server(self):
+ environment = webkit.WebKitPort.setup_environ_for_server(self)
+ environment['GTK_MODULES'] = 'gail'
+ environment['LIBOVERLAY_SCROLLBAR'] = '0'
+ environment['WEBKIT_INSPECTOR_PATH'] = self._build_path('Programs/resources/inspector')
+
+ return environment
+
def _path_to_apache_config_file(self):
# FIXME: This needs to detect the distribution and change config files.
return self._filesystem.join(self.layout_tests_dir(), 'http', 'conf', 'apache2-debian-httpd.conf')
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
