<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172830] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172830">172830</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2014-08-21 08:47:21 -0700 (Thu, 21 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] Load the llvmpipe (Mesa) libraries when running the tests with Xvfb.
https://bugs.webkit.org/show_bug.cgi?id=134070
Reviewed by Martin Robinson.
* Scripts/webkitpy/port/base.py:
(Port.__init__): Set default _jhbuild_wrapper variable.
(Port._should_use_jhbuild): Implement generic check.
* Scripts/webkitpy/port/efl.py: Rename to jhbuild_wrapper variable
to make it consistent with the other ports.
* Scripts/webkitpy/port/gtk.py:
(GtkPort.__init__): Use the new _should_use_jhbuild() method.
(GtkPort.setup_environ_for_server): Get the path for llvmpipe_libgl_path by
querying the jhbuild with printenv. Also check that the path contains
the libraries we expect. Preload this path only for XvfbDriver.
* Scripts/webkitpy/port/xvfbdriver.py:
(XvfbDriver.check_driver): Check for the jhbuild wrapper and use it.
(XvfbDriver._start): The environment for llvmpipe_libgl_path is now
configured at setup_environ_for_server()
* Scripts/webkitpy/port/xvfbdriver_unittest.py:
(XvfbDriverTest.make_driver): Get the port default environment.
(XvfbDriverTest.test_start_no_pixel_tests): The expected log now
should include the environment that is passed when running Xvfb.
(XvfbDriverTest.test_start_pixel_tests): Ditto.
(XvfbDriverTest.test_start_arbitrary_worker_number): Ditto.
(XvfbDriverTest.test_start_next_worker): Ditto.
* gtk/jhbuild.modules: Rename checkoutdir to generic "Mesa" to
prevent future problems when the version is raised. Add also a
comment with a warning.
* gtk/jhbuildrc: The path LLVMPIPE_LIBGL_PATH should be the one
that has the llvm optimized Gallium libGL libraries.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyporteflpy">trunk/Tools/Scripts/webkitpy/port/efl.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportgtkpy">trunk/Tools/Scripts/webkitpy/port/gtk.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxvfbdriverpy">trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxvfbdriver_unittestpy">trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py</a></li>
<li><a href="#trunkToolsgtkjhbuildmodules">trunk/Tools/gtk/jhbuild.modules</a></li>
<li><a href="#trunkToolsgtkjhbuildrc">trunk/Tools/gtk/jhbuildrc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (172829 => 172830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-08-21 12:29:37 UTC (rev 172829)
+++ trunk/Tools/ChangeLog 2014-08-21 15:47:21 UTC (rev 172830)
</span><span class="lines">@@ -1,3 +1,37 @@
</span><ins>+2014-08-21 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] Load the llvmpipe (Mesa) libraries when running the tests with Xvfb.
+ https://bugs.webkit.org/show_bug.cgi?id=134070
+
+ Reviewed by Martin Robinson.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.__init__): Set default _jhbuild_wrapper variable.
+ (Port._should_use_jhbuild): Implement generic check.
+ * Scripts/webkitpy/port/efl.py: Rename to jhbuild_wrapper variable
+ to make it consistent with the other ports.
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.__init__): Use the new _should_use_jhbuild() method.
+ (GtkPort.setup_environ_for_server): Get the path for llvmpipe_libgl_path by
+ querying the jhbuild with printenv. Also check that the path contains
+ the libraries we expect. Preload this path only for XvfbDriver.
+ * Scripts/webkitpy/port/xvfbdriver.py:
+ (XvfbDriver.check_driver): Check for the jhbuild wrapper and use it.
+ (XvfbDriver._start): The environment for llvmpipe_libgl_path is now
+ configured at setup_environ_for_server()
+ * Scripts/webkitpy/port/xvfbdriver_unittest.py:
+ (XvfbDriverTest.make_driver): Get the port default environment.
+ (XvfbDriverTest.test_start_no_pixel_tests): The expected log now
+ should include the environment that is passed when running Xvfb.
+ (XvfbDriverTest.test_start_pixel_tests): Ditto.
+ (XvfbDriverTest.test_start_arbitrary_worker_number): Ditto.
+ (XvfbDriverTest.test_start_next_worker): Ditto.
+ * gtk/jhbuild.modules: Rename checkoutdir to generic "Mesa" to
+ prevent future problems when the version is raised. Add also a
+ comment with a warning.
+ * gtk/jhbuildrc: The path LLVMPIPE_LIBGL_PATH should be the one
+ that has the llvm optimized Gallium libGL libraries.
+
</ins><span class="cx"> 2014-08-21 Renato Nagy <nagy.renato@stud.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> Fix countFailures of RunLLINTCLoopTests and Run32bitJSCTests.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (172829 => 172830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2014-08-21 12:29:37 UTC (rev 172829)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2014-08-21 15:47:21 UTC (rev 172830)
</span><span class="lines">@@ -132,6 +132,7 @@
</span><span class="cx"> self._reftest_list = {}
</span><span class="cx"> self._results_directory = None
</span><span class="cx"> self._root_was_set = hasattr(options, 'root') and options.root
</span><ins>+ self._jhbuild_wrapper = []
</ins><span class="cx">
</span><span class="cx"> def additional_drt_flag(self):
</span><span class="cx"> return []
</span><span class="lines">@@ -1267,6 +1268,9 @@
</span><span class="cx"> # --pixel-test-directory is not specified.
</span><span class="cx"> return True
</span><span class="cx">
</span><ins>+ def _should_use_jhbuild(self):
+ return os.path.exists(self.path_from_webkit_base('WebKitBuild', 'Dependencies'))
+
</ins><span class="cx"> # FIXME: Eventually we should standarize port naming, and make this method smart enough
</span><span class="cx"> # to use for all port configurations (including architectures, graphics types, etc).
</span><span class="cx"> def _port_flag_for_scripts(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyporteflpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/efl.py (172829 => 172830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/efl.py 2014-08-21 12:29:37 UTC (rev 172829)
+++ trunk/Tools/Scripts/webkitpy/port/efl.py 2014-08-21 15:47:21 UTC (rev 172830)
</span><span class="lines">@@ -42,9 +42,9 @@
</span><span class="cx"> def __init__(self, *args, **kwargs):
</span><span class="cx"> super(EflPort, self).__init__(*args, **kwargs)
</span><span class="cx">
</span><del>- self._jhbuild_wrapper_path = [self.path_from_webkit_base('Tools', 'jhbuild', 'jhbuild-wrapper'), '--efl', 'run']
</del><ins>+ self._jhbuild_wrapper = [self.path_from_webkit_base('Tools', 'jhbuild', 'jhbuild-wrapper'), '--efl', 'run']
</ins><span class="cx">
</span><del>- self.set_option_default('wrapper', ' '.join(self._jhbuild_wrapper_path))
</del><ins>+ self.set_option_default('wrapper', ' '.join(self._jhbuild_wrapper))
</ins><span class="cx"> self.webprocess_cmd_prefix = self.get_option('webprocess_cmd_prefix')
</span><span class="cx">
</span><span class="cx"> self._pulseaudio_sanitizer = PulseAudioSanitizer()
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> return self._build_path('bin', 'ImageDiff')
</span><span class="cx">
</span><span class="cx"> def _image_diff_command(self, *args, **kwargs):
</span><del>- return self._jhbuild_wrapper_path + super(EflPort, self)._image_diff_command(*args, **kwargs)
</del><ins>+ return self._jhbuild_wrapper + super(EflPort, self)._image_diff_command(*args, **kwargs)
</ins><span class="cx">
</span><span class="cx"> def _path_to_webcore_library(self):
</span><span class="cx"> static_path = self._build_path('lib', 'libwebcore_efl.a')
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (172829 => 172830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-08-21 12:29:37 UTC (rev 172829)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-08-21 15:47:21 UTC (rev 172830)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> import os
</span><span class="cx"> import subprocess
</span><span class="cx"> import uuid
</span><ins>+import logging
</ins><span class="cx">
</span><span class="cx"> from webkitpy.common.memoized import memoized
</span><span class="cx"> from webkitpy.layout_tests.models.test_configuration import TestConfiguration
</span><span class="lines">@@ -41,6 +42,7 @@
</span><span class="cx"> from webkitpy.port.linux_get_crash_log import GDBCrashLogGenerator
</span><span class="cx"> from webkitpy.port.leakdetector_valgrind import LeakDetectorValgrind
</span><span class="cx">
</span><ins>+_log = logging.getLogger(__name__)
</ins><span class="cx">
</span><span class="cx"> class GtkPort(Port):
</span><span class="cx"> port_name = "gtk"
</span><span class="lines">@@ -54,7 +56,7 @@
</span><span class="cx"> if not self.get_option("wrapper"):
</span><span class="cx"> raise ValueError('use --wrapper=\"valgrind\" for memory leak detection on GTK')
</span><span class="cx">
</span><del>- if os.path.exists(self.path_from_webkit_base('WebKitBuild', 'Dependencies')):
</del><ins>+ if self._should_use_jhbuild():
</ins><span class="cx"> self._jhbuild_wrapper = [self.path_from_webkit_base('Tools', 'jhbuild', 'jhbuild-wrapper'), '--gtk', 'run']
</span><span class="cx"> if self.get_option('wrapper'):
</span><span class="cx"> self.set_option('wrapper', ' '.join(self._jhbuild_wrapper) + ' ' + self.get_option('wrapper'))
</span><span class="lines">@@ -113,6 +115,16 @@
</span><span class="cx"> environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
</span><span class="cx"> environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib')
</span><span class="cx"> self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
</span><ins>+ if self._driver_class() == XvfbDriver and self._should_use_jhbuild():
+ llvmpipe_libgl_path = self.host.executive.run_command(self._jhbuild_wrapper + ['printenv', 'LLVMPIPE_LIBGL_PATH'],
+ error_handler=self.host.executive.ignore_error).strip()
+ if os.path.exists(os.path.join(llvmpipe_libgl_path, "libGL.so")):
+ # Force the Gallium llvmpipe software rasterizer
+ environment['LD_LIBRARY_PATH'] = llvmpipe_libgl_path
+ if os.environ.get('LD_LIBRARY_PATH'):
+ environment['LD_LIBRARY_PATH'] += ':%s' % os.environ.get('LD_LIBRARY_PATH')
+ else:
+ _log.warning("Can't find Gallium llvmpipe driver. Try to run update-webkitgtk-libs")
</ins><span class="cx"> if self.get_option("leaks"):
</span><span class="cx"> # Turn off GLib memory optimisations https://wiki.gnome.org/Valgrind.
</span><span class="cx"> environment['G_SLICE'] = 'always-malloc'
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxvfbdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py (172829 => 172830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2014-08-21 12:29:37 UTC (rev 172829)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2014-08-21 15:47:21 UTC (rev 172830)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx"> # Copyright (C) 2010 Google Inc. All rights reserved.
</span><ins>+# Copyright (C) 2014 Igalia S.L.
</ins><span class="cx"> #
</span><span class="cx"> # Redistribution and use in source and binary forms, with or without
</span><span class="cx"> # modification, are permitted provided that the following conditions are
</span><span class="lines">@@ -41,7 +42,10 @@
</span><span class="cx"> class XvfbDriver(Driver):
</span><span class="cx"> @staticmethod
</span><span class="cx"> def check_driver(port):
</span><del>- xvfb_found = port.host.executive.run_command(['which', 'Xvfb'], return_exit_code=True) is 0
</del><ins>+ xvfb_findcmd = ['which', 'Xvfb']
+ if port._should_use_jhbuild():
+ xvfb_findcmd = port._jhbuild_wrapper + xvfb_findcmd
+ xvfb_found = port.host.executive.run_command(xvfb_findcmd, return_exit_code=True) is 0
</ins><span class="cx"> if not xvfb_found:
</span><span class="cx"> _log.error("No Xvfb found. Cannot run layout tests.")
</span><span class="cx"> return xvfb_found
</span><span class="lines">@@ -80,13 +84,13 @@
</span><span class="cx"> server_name = self._port.driver_name()
</span><span class="cx"> environment = self._port.setup_environ_for_server(server_name)
</span><span class="cx">
</span><del>- llvmpipe_libgl_path = os.environ.get('LLVMPIPE_LIBGL_PATH')
- if llvmpipe_libgl_path:
- environment['LD_LIBRARY_PATH'] = '%s:%s' % (llvmpipe_libgl_path, os.environ.get('LD_LIBRARY_PATH', ''))
</del><ins>+ run_xvfb = ["Xvfb", ":%d" % display_id, "-screen", "0", "1024x768x%s" % self._xvfb_screen_depth(), "-nolisten", "tcp"]
</ins><span class="cx">
</span><del>- run_xvfb = ["Xvfb", ":%d" % display_id, "-screen", "0", "1024x768x%s" % self._xvfb_screen_depth(), "-nolisten", "tcp"]
</del><ins>+ if self._port._should_use_jhbuild():
+ run_xvfb = self._port._jhbuild_wrapper + run_xvfb
+
</ins><span class="cx"> with open(os.devnull, 'w') as devnull:
</span><del>- self._xvfb_process = self._port.host.executive.popen(run_xvfb, stderr=devnull)
</del><ins>+ self._xvfb_process = self._port.host.executive.popen(run_xvfb, stderr=devnull, env=environment)
</ins><span class="cx">
</span><span class="cx"> # Crashes intend to occur occasionally in the first few tests that are run through each
</span><span class="cx"> # worker because the Xvfb display isn't ready yet. Halting execution a bit should avoid that.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxvfbdriver_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py (172829 => 172830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py 2014-08-21 12:29:37 UTC (rev 172829)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver_unittest.py 2014-08-21 15:47:21 UTC (rev 172830)
</span><span class="lines">@@ -52,6 +52,7 @@
</span><span class="cx"> driver = XvfbDriver(port, worker_number=worker_number, pixel_tests=True)
</span><span class="cx"> driver._startup_delay_secs = 0
</span><span class="cx"> driver._xvfb_screen_depth = lambda: '24'
</span><ins>+ driver._environment = port.setup_environ_for_server(port.driver_name())
</ins><span class="cx"> return driver
</span><span class="cx">
</span><span class="cx"> def cleanup_driver(self, driver):
</span><span class="lines">@@ -67,19 +68,19 @@
</span><span class="cx">
</span><span class="cx"> def test_start_no_pixel_tests(self):
</span><span class="cx"> driver = self.make_driver()
</span><del>- expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0")
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="cx"> def test_start_pixel_tests(self):
</span><span class="cx"> driver = self.make_driver()
</span><del>- expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="cx"> def test_start_arbitrary_worker_number(self):
</span><span class="cx"> driver = self.make_driver(worker_number=17)
</span><del>- expected_logs = "MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = ("MOCK run_command: ['ps', '-eo', 'comm,command'], cwd=None\nMOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span><span class="lines">@@ -108,12 +109,12 @@
</span><span class="cx"> def test_start_next_worker(self):
</span><span class="cx"> driver = self.make_driver()
</span><span class="cx"> driver._next_free_display = lambda: 0
</span><del>- expected_logs = "MOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = ("MOCK popen: ['Xvfb', ':0', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":0", pixel_tests=True)
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx"> driver = self.make_driver()
</span><span class="cx"> driver._next_free_display = lambda: 3
</span><del>- expected_logs = "MOCK popen: ['Xvfb', ':3', '-screen', '0', '1024x768x24', '-nolisten', 'tcp']\n"
</del><ins>+ expected_logs = ("MOCK popen: ['Xvfb', ':3', '-screen', '0', '1024x768x24', '-nolisten', 'tcp'], env=%s\n" % driver._environment)
</ins><span class="cx"> self.assertDriverStartSuccessful(driver, expected_logs=expected_logs, expected_display=":3", pixel_tests=True)
</span><span class="cx"> self.cleanup_driver(driver)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildmodules"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuild.modules (172829 => 172830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuild.modules 2014-08-21 12:29:37 UTC (rev 172829)
+++ trunk/Tools/gtk/jhbuild.modules 2014-08-21 15:47:21 UTC (rev 172830)
</span><span class="lines">@@ -335,8 +335,10 @@
</span><span class="cx"> </autotools>
</span><span class="cx">
</span><span class="cx"> <autotools id="mesa" autogenargs="--enable-xlib-glx --disable-dri --with-gallium-drivers=swrast" skip-install="true">
</span><ins>+ <!--- WARNING: At jhbuildrc, when we define the path to the Gallium llvmpipe software rasterizer (needed by XvfbDriver),
+ we assume that the directory is named "Mesa". So, don't change the checkoutdir name even if you update the version. -->
</ins><span class="cx"> <branch module="/pub/mesa/10.2.1/MesaLib-10.2.1.tar.bz2" version="10.2.1"
</span><del>- checkoutdir="Mesa-10.2.1"
</del><ins>+ checkoutdir="Mesa"
</ins><span class="cx"> repo="ftp.freedesktop.org"
</span><span class="cx"> hash="sha256:461277909207da689d8152cfbf9e182ea6f70e1e672ab64c67df83725c8d2b54"/>
</span><span class="cx"> </autotools>
</span></span></pre></div>
<a id="trunkToolsgtkjhbuildrc"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/jhbuildrc (172829 => 172830)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/jhbuildrc 2014-08-21 12:29:37 UTC (rev 172829)
+++ trunk/Tools/gtk/jhbuildrc 2014-08-21 15:47:21 UTC (rev 172830)
</span><span class="lines">@@ -1,5 +1,5 @@
</span><span class="cx"> #!/usr/bin/env python
</span><del>-# Copyright (C) 2011 Igalia S.L.
</del><ins>+# Copyright (C) 2011-2014 Igalia S.L.
</ins><span class="cx"> #
</span><span class="cx"> # This library is free software; you can redistribute it and/or
</span><span class="cx"> # modify it under the terms of the GNU Lesser General Public
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
</span><span class="cx">
</span><span class="cx"> import sys
</span><ins>+import os
</ins><span class="cx">
</span><span class="cx"> sys.path.insert(0, os.path.join(os.path.dirname(__file__), "../jhbuild") )
</span><span class="cx"> import jhbuildrc_common
</span><span class="lines">@@ -33,6 +34,6 @@
</span><span class="cx"> autogenargs='--enable-introspection'
</span><span class="cx">
</span><span class="cx"> if use_lib64:
</span><del>- os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa-10.2.1', 'lib64'))
</del><ins>+ os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa', 'lib64', 'gallium'))
</ins><span class="cx"> else:
</span><del>- os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa-10.2.1', 'lib'))
</del><ins>+ os.environ['LLVMPIPE_LIBGL_PATH'] = os.path.abspath(os.path.join(checkoutroot, 'Mesa', 'lib', 'gallium'))
</ins></span></pre>
</div>
</div>
</body>
</html>