<!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>[205014] 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/205014">205014</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2016-08-26 09:32:32 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] run-gtk-tests should use webkitpy.port.gtk and webkitpy.port.xvfbdriver
https://bugs.webkit.org/show_bug.cgi?id=160736
Reviewed by Carlos Garcia Campos.
This plugs run-gtk-tests into the webkitpy testing infrastructure.
As a benefit of this, run-gtk-tests now can be executed over any of
the existing supported gtk test display servers (xvfb, weston-over-xvfb,
or native xorg). A new command line switch --wayland is added for
run-gtk-tests.
* Scripts/run-gtk-tests:
(TestRunner.__init__): Remove the --display command line switch, its not longer useful.
Add a --wayland command line switch.
(TestRunner._start_accessibility_daemons):
(TestRunner):
(TestRunner.__init__):
(TestRunner._run_xvfb): Deleted.
(TestRunner._create_driver):
(TestRunner._setup_testing_environment): Delete the environment variable definitions that
are now done by driver._setup_environ_for_test().
(TestRunner._tear_down_testing_environment):
* Scripts/webkitpy/port/driver.py:
(Driver.__init__): Define self._server_name in the constructor of the base class.
It is used by several functions, so it makes sense to store once the value here.
(Driver._setup_environ_for_test): Factorize setting the environment for a given test.
(Driver._start): Get the environment from self._setup_environ_for_test()
* Scripts/webkitpy/port/driver_unittest.py:
(DriverTest):
(DriverTest.test_setup_environ_for_test): Add unittest for driver._setup_environ_for_test()
* Scripts/webkitpy/port/gtk.py: Move the inspection of the env var USE_NATIVE_XDISPLAY to the constructor.
(GtkPort.__init__):
(GtkPort._driver_class):
* Scripts/webkitpy/port/westondriver.py: Define and use self._setup_environ_for_test()
(WestonDriver._setup_environ_for_test):
(WestonDriver._start):
* Scripts/webkitpy/port/xorgdriver.py: Define and use self._setup_environ_for_test()
(XorgDriver._setup_environ_for_test):
(XorgDriver._start):
* Scripts/webkitpy/port/xvfbdriver.py: Define and use self._setup_environ_for_test()
(XvfbDriver._setup_environ_for_test):
(XvfbDriver._start):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrungtktests">trunk/Tools/Scripts/run-gtk-tests</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportdriver_unittestpy">trunk/Tools/Scripts/webkitpy/port/driver_unittest.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportgtkpy">trunk/Tools/Scripts/webkitpy/port/gtk.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportwestondriverpy">trunk/Tools/Scripts/webkitpy/port/westondriver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxorgdriverpy">trunk/Tools/Scripts/webkitpy/port/xorgdriver.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportxvfbdriverpy">trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205013 => 205014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-26 16:04:23 UTC (rev 205013)
+++ trunk/Tools/ChangeLog 2016-08-26 16:32:32 UTC (rev 205014)
</span><span class="lines">@@ -1,3 +1,48 @@
</span><ins>+2016-08-26 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] run-gtk-tests should use webkitpy.port.gtk and webkitpy.port.xvfbdriver
+ https://bugs.webkit.org/show_bug.cgi?id=160736
+
+ Reviewed by Carlos Garcia Campos.
+
+ This plugs run-gtk-tests into the webkitpy testing infrastructure.
+ As a benefit of this, run-gtk-tests now can be executed over any of
+ the existing supported gtk test display servers (xvfb, weston-over-xvfb,
+ or native xorg). A new command line switch --wayland is added for
+ run-gtk-tests.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner.__init__): Remove the --display command line switch, its not longer useful.
+ Add a --wayland command line switch.
+ (TestRunner._start_accessibility_daemons):
+ (TestRunner):
+ (TestRunner.__init__):
+ (TestRunner._run_xvfb): Deleted.
+ (TestRunner._create_driver):
+ (TestRunner._setup_testing_environment): Delete the environment variable definitions that
+ are now done by driver._setup_environ_for_test().
+ (TestRunner._tear_down_testing_environment):
+ * Scripts/webkitpy/port/driver.py:
+ (Driver.__init__): Define self._server_name in the constructor of the base class.
+ It is used by several functions, so it makes sense to store once the value here.
+ (Driver._setup_environ_for_test): Factorize setting the environment for a given test.
+ (Driver._start): Get the environment from self._setup_environ_for_test()
+ * Scripts/webkitpy/port/driver_unittest.py:
+ (DriverTest):
+ (DriverTest.test_setup_environ_for_test): Add unittest for driver._setup_environ_for_test()
+ * Scripts/webkitpy/port/gtk.py: Move the inspection of the env var USE_NATIVE_XDISPLAY to the constructor.
+ (GtkPort.__init__):
+ (GtkPort._driver_class):
+ * Scripts/webkitpy/port/westondriver.py: Define and use self._setup_environ_for_test()
+ (WestonDriver._setup_environ_for_test):
+ (WestonDriver._start):
+ * Scripts/webkitpy/port/xorgdriver.py: Define and use self._setup_environ_for_test()
+ (XorgDriver._setup_environ_for_test):
+ (XorgDriver._start):
+ * Scripts/webkitpy/port/xvfbdriver.py: Define and use self._setup_environ_for_test()
+ (XvfbDriver._setup_environ_for_test):
+ (XvfbDriver._start):
+
</ins><span class="cx"> 2016-08-26 Csaba Osztrogonác <ossy@webkit.org>
</span><span class="cx">
</span><span class="cx"> [EFL][GTK] REGRESSION(204877): Fix the clean build
</span></span></pre></div>
<a id="trunkToolsScriptsrungtktests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-gtk-tests (205013 => 205014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-gtk-tests 2016-08-26 16:04:23 UTC (rev 205013)
+++ trunk/Tools/Scripts/run-gtk-tests 2016-08-26 16:32:32 UTC (rev 205014)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> sys.path.append(os.path.join(top_level_directory, "Tools", "gtk"))
</span><span class="cx"> import common
</span><span class="cx"> import jhbuildutils
</span><ins>+from webkitpy.common.host import Host
</ins><span class="cx">
</span><span class="cx"> class SkippedTest:
</span><span class="cx"> ENTIRE_SUITE = None
</span><span class="lines">@@ -97,6 +98,8 @@
</span><span class="cx">
</span><span class="cx"> self._build_type = "Debug" if self._options.debug else "Release"
</span><span class="cx"> common.set_build_types((self._build_type,))
</span><ins>+ self._port = Host().port_factory.get("gtk")
+ self._driver = self._create_driver()
</ins><span class="cx">
</span><span class="cx"> self._programs_path = common.binary_build_path()
</span><span class="cx"> self._tests = self._get_tests(tests)
</span><span class="lines">@@ -179,34 +182,22 @@
</span><span class="cx">
</span><span class="cx"> return True
</span><span class="cx">
</span><del>- def _run_xvfb(self):
- self._xvfb = None
- if not self._options.use_xvfb:
- return True
</del><ins>+ def _create_driver(self, port_options=[]):
+ if self._options.use_wayland:
+ self._port._wayland = True
+ else:
+ self._port._nativexorg = not self._options.use_xvfb
+ driver = self._port.create_driver(worker_number=0, no_timeout=True)._make_driver(pixel_tests=False)
+ if not driver.check_driver(self._port):
+ raise RuntimeError("Failed to check driver %s" %driver.__class__.__name__)
+ return driver
</ins><span class="cx">
</span><del>- self._test_env["DISPLAY"] = self._options.display
-
- try:
- self._xvfb = subprocess.Popen(["Xvfb", self._options.display, "-screen", "0", "800x600x24", "-nolisten", "tcp"],
- stdout=subprocess.PIPE, stderr=subprocess.PIPE)
- except Exception as e:
- sys.stderr.write("Failed to run Xvfb: %s\n" % e)
- sys.stderr.flush()
- return False
-
- return True
-
</del><span class="cx"> def _setup_testing_environment(self):
</span><del>- self._test_env = os.environ
- self._test_env['GSETTINGS_BACKEND'] = 'memory'
</del><ins>+ self._test_env = self._driver._setup_environ_for_test()
</ins><span class="cx"> self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
</span><span class="cx"> self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.library_build_path()
</span><span class="cx"> self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
</span><del>- self._test_env["OWR_USE_TEST_SOURCES"] = '1'
</del><span class="cx">
</span><del>- if not self._run_xvfb():
- return False
-
</del><span class="cx"> # If we cannot start the accessibility daemons, we can just skip the accessibility tests.
</span><span class="cx"> if not self._start_accessibility_daemons():
</span><span class="cx"> print "Could not start accessibility bus, so disabling TestWebKitAccessibility"
</span><span class="lines">@@ -218,8 +209,8 @@
</span><span class="cx"> self._spi_registryd.terminate()
</span><span class="cx"> if self._spi_bus_launcher:
</span><span class="cx"> self._spi_bus_launcher.terminate()
</span><del>- if self._xvfb:
- self._xvfb.terminate()
</del><ins>+ if self._driver:
+ self._driver.stop()
</ins><span class="cx">
</span><span class="cx"> def _test_cases_to_skip(self, test_program):
</span><span class="cx"> if self._options.skipped_action != 'skip':
</span><span class="lines">@@ -462,8 +453,6 @@
</span><span class="cx"> option_parser.add_option('-v', '--verbose',
</span><span class="cx"> action='store_true', dest='verbose',
</span><span class="cx"> help='Run gtester in verbose mode')
</span><del>- option_parser.add_option('--display', action='store', dest='display', default=':55',
- help='Display to run Xvfb')
</del><span class="cx"> option_parser.add_option('--skipped', action='store', dest='skipped_action',
</span><span class="cx"> choices=['skip', 'ignore', 'only'], default='skip',
</span><span class="cx"> metavar='skip|ignore|only',
</span><span class="lines">@@ -473,6 +462,9 @@
</span><span class="cx"> help='Time in seconds until a test times out')
</span><span class="cx"> option_parser.add_option('--no-xvfb', action='store_false', dest='use_xvfb', default=True,
</span><span class="cx"> help='Do not run tests under Xvfb')
</span><ins>+ option_parser.add_option('--wayland', action='store_true', dest='use_wayland', default=False,
+ help='Run the layout tests inside a (virtualized) weston')
</ins><span class="cx"> options, args = option_parser.parse_args()
</span><span class="cx">
</span><del>- sys.exit(TestRunner(options, args).run_tests())
</del><ins>+ runner = TestRunner(options, args)
+ sys.exit(runner.run_tests())
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (205013 => 205014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2016-08-26 16:04:23 UTC (rev 205013)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2016-08-26 16:32:32 UTC (rev 205014)
</span><span class="lines">@@ -154,6 +154,8 @@
</span><span class="cx"> # instead scope these locally in run_test.
</span><span class="cx"> self.error_from_test = str()
</span><span class="cx"> self.err_seen_eof = False
</span><ins>+
+ self._server_name = self._port.driver_name()
</ins><span class="cx"> self._server_process = None
</span><span class="cx">
</span><span class="cx"> self._measurements = {}
</span><span class="lines">@@ -346,6 +348,11 @@
</span><span class="cx"> environment = self._profiler.adjusted_environment(environment)
</span><span class="cx"> return environment
</span><span class="cx">
</span><ins>+ def _setup_environ_for_test(self):
+ environment = self._port.setup_environ_for_server(self._server_name)
+ environment = self._setup_environ_for_driver(environment)
+ return environment
+
</ins><span class="cx"> def _start(self, pixel_tests, per_test_args):
</span><span class="cx"> self.stop()
</span><span class="cx"> # Each driver process should be using individual directories under _driver_tempdir (which is deleted when stopping),
</span><span class="lines">@@ -357,12 +364,10 @@
</span><span class="cx"> if user_cache_directory:
</span><span class="cx"> self._port._filesystem.maybe_make_directory(user_cache_directory)
</span><span class="cx"> self._driver_user_cache_directory = user_cache_directory
</span><del>- server_name = self._port.driver_name()
- environment = self._port.setup_environ_for_server(server_name)
- environment = self._setup_environ_for_driver(environment)
</del><ins>+ environment = self._setup_environ_for_test()
</ins><span class="cx"> self._crashed_process_name = None
</span><span class="cx"> self._crashed_pid = None
</span><del>- self._server_process = self._port._server_process_constructor(self._port, server_name, self.cmd_line(pixel_tests, per_test_args), environment)
</del><ins>+ self._server_process = self._port._server_process_constructor(self._port, self._server_name, self.cmd_line(pixel_tests, per_test_args), environment)
</ins><span class="cx"> self._server_process.start()
</span><span class="cx">
</span><span class="cx"> def _run_post_start_tasks(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriver_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver_unittest.py (205013 => 205014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver_unittest.py 2016-08-26 16:04:23 UTC (rev 205013)
+++ trunk/Tools/Scripts/webkitpy/port/driver_unittest.py 2016-08-26 16:32:32 UTC (rev 205014)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx">
</span><span class="cx"> from webkitpy.port import Port, Driver, DriverOutput
</span><span class="cx"> from webkitpy.port.server_process_mock import MockServerProcess
</span><ins>+from webkitpy.thirdparty.mock import patch
</ins><span class="cx">
</span><span class="cx"> # FIXME: remove the dependency on TestWebKitPort
</span><span class="cx"> from webkitpy.port.port_testcase import TestWebKitPort
</span><span class="lines">@@ -311,3 +312,15 @@
</span><span class="cx"> environment[variable] = base_value
</span><span class="cx"> driver._append_environment_variable_path(environment, variable, path)
</span><span class="cx"> self.assertEqual(environment[variable], base_value + os.pathsep + path)
</span><ins>+
+ def test_setup_environ_for_test(self):
+ environment_user = {}
+ environment_user['WEBKIT_OUTPUTDIR'] = '/opt/webkit/WebKitBuild/Release'
+ environment_user['FOO'] = 'BAR'
+ with patch('os.environ', environment_user):
+ port = self.make_port()
+ driver = Driver(port, None, pixel_tests=False)
+ environment_driver_test = driver._setup_environ_for_test()
+ self.assertNotIn('FOO', environment_driver_test)
+ self.assertIn('WEBKIT_OUTPUTDIR', environment_driver_test)
+ self.assertEqual(environment_user['WEBKIT_OUTPUTDIR'], environment_driver_test['WEBKIT_OUTPUTDIR'])
</ins></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (205013 => 205014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2016-08-26 16:04:23 UTC (rev 205013)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2016-08-26 16:32:32 UTC (rev 205014)
</span><span class="lines">@@ -53,6 +53,9 @@
</span><span class="cx"> super(GtkPort, self).__init__(*args, **kwargs)
</span><span class="cx"> self._pulseaudio_sanitizer = PulseAudioSanitizer()
</span><span class="cx"> self._wayland = self.get_option("wayland")
</span><ins>+ self._nativexorg = False
+ if os.environ.get("USE_NATIVE_XDISPLAY"):
+ self._nativexorg = True
</ins><span class="cx">
</span><span class="cx"> if self.get_option("leaks"):
</span><span class="cx"> self._leakdetector = LeakDetectorValgrind(self._executive, self._filesystem, self.results_directory())
</span><span class="lines">@@ -79,7 +82,7 @@
</span><span class="cx"> def _driver_class(self):
</span><span class="cx"> if self._wayland:
</span><span class="cx"> return WestonDriver
</span><del>- if os.environ.get("USE_NATIVE_XDISPLAY"):
</del><ins>+ if self._nativexorg:
</ins><span class="cx"> return XorgDriver
</span><span class="cx"> return XvfbDriver
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportwestondriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/westondriver.py (205013 => 205014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/westondriver.py 2016-08-26 16:04:23 UTC (rev 205013)
+++ trunk/Tools/Scripts/webkitpy/port/westondriver.py 2016-08-26 16:32:32 UTC (rev 205014)
</span><span class="lines">@@ -54,16 +54,10 @@
</span><span class="cx"> self._startup_delay_secs = 1.0
</span><span class="cx"> self._xvfbdriver = XvfbDriver(*args, **kwargs)
</span><span class="cx">
</span><del>- def _start(self, pixel_tests, per_test_args):
- self.stop()
-
- driver_name = self._port.driver_name()
-
- self._driver_directory = self._port.host.filesystem.mkdtemp(prefix='%s-' % driver_name)
-
- driver_environment = self._port.setup_environ_for_server(driver_name)
</del><ins>+ def _setup_environ_for_test(self):
+ self._driver_directory = self._port.host.filesystem.mkdtemp(prefix='%s-' % self._server_name)
+ driver_environment = self._port.setup_environ_for_server(self._server_name)
</ins><span class="cx"> driver_environment['DISPLAY'] = ":%d" % self._xvfbdriver._xvfb_run(driver_environment)
</span><del>-
</del><span class="cx"> weston_socket = 'WKTesting-weston-%032x' % random.getrandbits(128)
</span><span class="cx"> weston_command = ['weston', '--socket=%s' % weston_socket, '--width=1024', '--height=768', '--use-pixman']
</span><span class="cx"> if self._port._should_use_jhbuild():
</span><span class="lines">@@ -75,20 +69,21 @@
</span><span class="cx"> time.sleep(self._startup_delay_secs)
</span><span class="cx">
</span><span class="cx"> driver_environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
</span><del>-
</del><span class="cx"> # Currently on WebKit2, there is no API for setting the application cache directory.
</span><span class="cx"> # Each worker should have its own and it should be cleaned afterwards, when the worker stops.
</span><span class="cx"> driver_environment['XDG_CACHE_HOME'] = self._ensure_driver_tmpdir_subdirectory('appcache')
</span><span class="cx"> driver_environment['DUMPRENDERTREE_TEMP'] = self._ensure_driver_tmpdir_subdirectory('drt-temp')
</span><del>-
</del><span class="cx"> driver_environment['WAYLAND_DISPLAY'] = weston_socket
</span><span class="cx"> driver_environment['GDK_BACKEND'] = 'wayland'
</span><span class="cx"> if driver_environment.get('DISPLAY'):
</span><span class="cx"> del driver_environment['DISPLAY']
</span><ins>+ return driver_environment
</ins><span class="cx">
</span><ins>+ def _start(self, pixel_tests, per_test_args):
+ self.stop()
</ins><span class="cx"> self._crashed_process_name = None
</span><span class="cx"> self._crashed_pid = None
</span><del>- self._server_process = self._port._server_process_constructor(self._port, driver_name, self.cmd_line(pixel_tests, per_test_args), driver_environment)
</del><ins>+ self._server_process = self._port._server_process_constructor(self._port, self._server_name, self.cmd_line(pixel_tests, per_test_args), self._setup_environ_for_test())
</ins><span class="cx"> self._server_process.start()
</span><span class="cx">
</span><span class="cx"> def stop(self):
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxorgdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xorgdriver.py (205013 => 205014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xorgdriver.py 2016-08-26 16:04:23 UTC (rev 205013)
+++ trunk/Tools/Scripts/webkitpy/port/xorgdriver.py 2016-08-26 16:32:32 UTC (rev 205014)
</span><span class="lines">@@ -44,15 +44,10 @@
</span><span class="cx"> return False
</span><span class="cx"> return True
</span><span class="cx">
</span><del>- def _start(self, pixel_tests, per_test_args):
- super(XorgDriver, self).stop()
-
- server_name = self._port.driver_name()
- self._driver_tempdir = self._port.host.filesystem.mkdtemp(prefix='%s-' % server_name)
-
</del><ins>+ def _setup_environ_for_test(self):
</ins><span class="cx"> # setup_environ_for_server() already takes care of copying the
</span><span class="cx"> # XAUTHORITY environment variable
</span><del>- server_environment = self._port.setup_environ_for_server(server_name)
</del><ins>+ server_environment = self._port.setup_environ_for_server(self._server_name)
</ins><span class="cx"> server_environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
</span><span class="cx"> server_environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
</span><span class="cx"> # Currently on WebKit2, there is no API for setting the application
</span><span class="lines">@@ -60,8 +55,14 @@
</span><span class="cx"> # cleaned afterwards, so we set it to inside the temporary folder by
</span><span class="cx"> # prepending XDG_CACHE_HOME with DUMPRENDERTREE_TEMP.
</span><span class="cx"> server_environment['XDG_CACHE_HOME'] = self._port.host.filesystem.join(str(self._driver_tempdir), 'appcache')
</span><ins>+ return server_environment
</ins><span class="cx">
</span><ins>+ def _start(self, pixel_tests, per_test_args):
+ super(XorgDriver, self).stop()
+
+ self._driver_tempdir = self._port.host.filesystem.mkdtemp(prefix='%s-' % self._server_name)
+
</ins><span class="cx"> self._crashed_process_name = None
</span><span class="cx"> self._crashed_pid = None
</span><del>- self._server_process = self._port._server_process_constructor(self._port, server_name, self.cmd_line(pixel_tests, per_test_args), server_environment)
</del><ins>+ self._server_process = self._port._server_process_constructor(self._port, self._server_name, self.cmd_line(pixel_tests, per_test_args), self._setup_environ_for_test())
</ins><span class="cx"> self._server_process.start()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportxvfbdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py (205013 => 205014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2016-08-26 16:04:23 UTC (rev 205013)
+++ trunk/Tools/Scripts/webkitpy/port/xvfbdriver.py 2016-08-26 16:32:32 UTC (rev 205014)
</span><span class="lines">@@ -92,16 +92,13 @@
</span><span class="cx"> def _xvfb_screen_depth(self):
</span><span class="cx"> return os.environ.get('XVFB_SCREEN_DEPTH', '24')
</span><span class="cx">
</span><del>- def _start(self, pixel_tests, per_test_args):
- self.stop()
-
- server_name = self._port.driver_name()
- environment = self._port.setup_environ_for_server(server_name)
</del><ins>+ def _setup_environ_for_test(self):
+ environment = self._port.setup_environ_for_server(self._server_name)
</ins><span class="cx"> display_id = self._xvfb_run(environment)
</span><span class="cx">
</span><span class="cx"> # We must do this here because the DISPLAY number depends on _worker_number
</span><span class="cx"> environment['DISPLAY'] = ":%d" % display_id
</span><del>- self._driver_tempdir = self._port.host.filesystem.mkdtemp(prefix='%s-' % self._port.driver_name())
</del><ins>+ self._driver_tempdir = self._port.host.filesystem.mkdtemp(prefix='%s-' % self._server_name)
</ins><span class="cx"> environment['DUMPRENDERTREE_TEMP'] = str(self._driver_tempdir)
</span><span class="cx"> environment['LOCAL_RESOURCE_ROOT'] = self._port.layout_tests_dir()
</span><span class="cx">
</span><span class="lines">@@ -110,10 +107,13 @@
</span><span class="cx"> # cleaned afterwards, so we set it to inside the temporary folder by
</span><span class="cx"> # prepending XDG_CACHE_HOME with DUMPRENDERTREE_TEMP.
</span><span class="cx"> environment['XDG_CACHE_HOME'] = self._port.host.filesystem.join(str(self._driver_tempdir), 'appcache')
</span><ins>+ return environment
</ins><span class="cx">
</span><ins>+ def _start(self, pixel_tests, per_test_args):
+ self.stop()
</ins><span class="cx"> self._crashed_process_name = None
</span><span class="cx"> self._crashed_pid = None
</span><del>- self._server_process = self._port._server_process_constructor(self._port, server_name, self.cmd_line(pixel_tests, per_test_args), environment)
</del><ins>+ self._server_process = self._port._server_process_constructor(self._port, self._server_name, self.cmd_line(pixel_tests, per_test_args), self._setup_environ_for_test())
</ins><span class="cx"> self._server_process.start()
</span><span class="cx">
</span><span class="cx"> def stop(self):
</span></span></pre>
</div>
</div>
</body>
</html>