Changeset 62635 in webkit

Timestamp:

Jul 7, 2010 1:38:08 AM (14 years ago)

Author:

commit-queue@webkit.org

Message:

2010-07-07 Gabor Rapcsanyi <​rgabor@inf.u-szeged.hu>

Reviewed by Eric Seidel.

Pass port specific environment to server process.
​https://bugs.webkit.org/show_bug.cgi?id=41593

• Scripts/webkitpy/layout_tests/port/qt.py:
• Scripts/webkitpy/layout_tests/port/webkit.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/qt.py (modified) (2 diffs)
• Scripts/webkitpy/layout_tests/port/webkit.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-07-07  Gabor Rapcsanyi  <rgabor@inf.u-szeged.hu>
+
+        Reviewed by Eric Seidel.
+
+        Pass port specific environment to server process.
+        https://bugs.webkit.org/show_bug.cgi?id=41593
+
+        * Scripts/webkitpy/layout_tests/port/qt.py:
+        * Scripts/webkitpy/layout_tests/port/webkit.py:
+
 2010-07-06  Kent Tamura  <tkent@chromium.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/qt.py

@@ -32 +32 @@
 import os
 import signal
+
+import webkit
 
 from webkitpy.layout_tests.port.webkit import WebKitPort
@@ -91 +93 @@
     def _path_to_driver(self):
         return self._build_path('bin/DumpRenderTree')
+
+    def setup_environ_for_server(self):
+        env = webkit.WebKitPort.setup_environ_for_server(self)
+        env['QTWEBKIT_PLUGIN_PATH'] = self._build_path('lib/plugins')
+        return env

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/webkit.py

@@ -42 +42 @@
 import time
 import webbrowser
+import tempfile
 
 from webkitpy.common.system.executive import Executive
@@ -380 +381 @@
         if self._image_path:
             command.append('--pixel-tests')
-        environment = os.environ
+        environment = self._port.setup_environ_for_server()
         environment['DYLD_FRAMEWORK_PATH'] = self._port._build_path()
+        environment['DUMPRENDERTREE_TEMP'] = tempfile.mkdtemp(prefix='DumpRenderTree-')
         self._server_process = server_process.ServerProcess(self._port,
             "DumpRenderTree", command, environment)