Title: [128364] trunk/Tools
Revision
128364
Author
kenn...@webkit.org
Date
2012-09-12 14:49:09 -0700 (Wed, 12 Sep 2012)

Log Message

Respect WEBKITOUTPUTDIR when running EFL tests
https://bugs.webkit.org/show_bug.cgi?id=96528

Reviewed by Dirk Pranke.

Expose user set WEBKITOUTPUTDIR to the web process.

* Scripts/webkitpy/layout_tests/port/driver.py:
(Driver._start): Add WEBKITOUTPUTDIR to the environment
of the web process and its potential jhbuild wrapper.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (128363 => 128364)


--- trunk/Tools/ChangeLog	2012-09-12 21:40:26 UTC (rev 128363)
+++ trunk/Tools/ChangeLog	2012-09-12 21:49:09 UTC (rev 128364)
@@ -1,3 +1,16 @@
+2012-09-12  Kenneth Rohde Christiansen  <kenn...@webkit.org>
+
+        Respect WEBKITOUTPUTDIR when running EFL tests
+        https://bugs.webkit.org/show_bug.cgi?id=96528
+
+        Reviewed by Dirk Pranke.
+
+        Expose user set WEBKITOUTPUTDIR to the web process.
+
+        * Scripts/webkitpy/layout_tests/port/driver.py:
+        (Driver._start): Add WEBKITOUTPUTDIR to the environment
+        of the web process and its potential jhbuild wrapper.
+
 2012-09-12  Dirk Pranke  <dpra...@chromium.org>
 
         webkitdirs: fix uname version handling for cygwin

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py (128363 => 128364)


--- trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py	2012-09-12 21:40:26 UTC (rev 128363)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/driver.py	2012-09-12 21:49:09 UTC (rev 128364)
@@ -33,6 +33,7 @@
 import shlex
 import sys
 import time
+import os
 
 from webkitpy.common.system import path
 
@@ -276,6 +277,8 @@
         # FIXME: We're assuming that WebKitTestRunner checks this DumpRenderTree-named environment variable.
         environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
         environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
+        if 'WEBKITOUTPUTDIR' in os.environ:
+            environment['WEBKITOUTPUTDIR'] = os.environ['WEBKITOUTPUTDIR']
         self._crashed_process_name = None
         self._crashed_pid = None
         self._server_process = self._port._server_process_constructor(self._port, server_name, self.cmd_line(pixel_tests, per_test_args), environment)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to