Title: [133050] trunk/Tools
- Revision
- 133050
- Author
- [email protected]
- Date
- 2012-10-31 11:28:37 -0700 (Wed, 31 Oct 2012)
Log Message
[NRWT] Xvfb driver is leaking application cache files
https://bugs.webkit.org/show_bug.cgi?id=100864
Patch by Thiago Marcos P. Santos <[email protected]> on 2012-10-31
Reviewed by Kenneth Rohde Christiansen.
Application Cache looks for XDG_CACHE_HOME which is now
prepended with DUMPRENDERTREE_TEMP and cleaned up when
the test worker finishes his job.
* Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
(XvfbDriver._start):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (133049 => 133050)
--- trunk/Tools/ChangeLog 2012-10-31 18:24:57 UTC (rev 133049)
+++ trunk/Tools/ChangeLog 2012-10-31 18:28:37 UTC (rev 133050)
@@ -1,5 +1,19 @@
2012-10-31 Thiago Marcos P. Santos <[email protected]>
+ [NRWT] Xvfb driver is leaking application cache files
+ https://bugs.webkit.org/show_bug.cgi?id=100864
+
+ Reviewed by Kenneth Rohde Christiansen.
+
+ Application Cache looks for XDG_CACHE_HOME which is now
+ prepended with DUMPRENDERTREE_TEMP and cleaned up when
+ the test worker finishes his job.
+
+ * Scripts/webkitpy/layout_tests/port/xvfbdriver.py:
+ (XvfbDriver._start):
+
+2012-10-31 Thiago Marcos P. Santos <[email protected]>
+
[EFL] DRT doesn't clean up after itself
https://bugs.webkit.org/show_bug.cgi?id=100346
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py (133049 => 133050)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py 2012-10-31 18:24:57 UTC (rev 133049)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/xvfbdriver.py 2012-10-31 18:28:37 UTC (rev 133050)
@@ -77,12 +77,16 @@
environment = self._port.setup_environ_for_server(server_name)
# We must do this here because the DISPLAY number depends on _worker_number
environment['DISPLAY'] = ":%d" % display_id
- # Drivers should use separate application cache locations
- environment['XDG_CACHE_HOME'] = self._port.host.filesystem.join(self._port.results_directory(), '%s-appcache-%d' % (server_name, self._worker_number))
self._driver_tempdir = self._port._filesystem.mkdtemp(prefix='%s-' % self._port.driver_name())
environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
+ # Currently on WebKit2, there is no API for setting the application
+ # cache directory. Each worker should have it's own and it should be
+ # cleaned afterwards, so we set it to inside the temporary folder by
+ # prepending XDG_CACHE_HOME with DUMPRENDERTREE_TEMP.
+ environment['XDG_CACHE_HOME'] = self._port.host.filesystem.join(str(self._driver_tempdir), 'appcache')
+
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
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
