<!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>[205017] 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/205017">205017</a></dd>
<dt>Author</dt> <dd>clopez@igalia.com</dd>
<dt>Date</dt> <dd>2016-08-26 09:36:29 -0700 (Fri, 26 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] run-gtk-tests should use the driver environment for checking the accessibility bus
https://bugs.webkit.org/show_bug.cgi?id=161149
Reviewed by Carlos Garcia Campos.
Add a new function for waiting for the accesibility bus. It sets
the test environment variables before starting the GLib mainloop.
And restores the previous environment after it has finished.
It also adds a timeout (5 seconds) to abort in case it has not
been able to detect the accesibility bus before the timeout expires.
* Scripts/run-gtk-tests:
(TestRunner):
(TestRunner._wait_for_accessibility_bus):
(TestRunner._wait_for_accessibility_bus.timeout_accessibility_bus):
(TestRunner._start_accessibility_daemons):
(TestRunner._get_tests_from_google_test_suite): Run this command also with the driver test environment.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (205016 => 205017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-26 16:35:26 UTC (rev 205016)
+++ trunk/Tools/ChangeLog 2016-08-26 16:36:29 UTC (rev 205017)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-08-26 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] run-gtk-tests should use the driver environment for checking the accessibility bus
+ https://bugs.webkit.org/show_bug.cgi?id=161149
+
+ Reviewed by Carlos Garcia Campos.
+
+ Add a new function for waiting for the accesibility bus. It sets
+ the test environment variables before starting the GLib mainloop.
+ And restores the previous environment after it has finished.
+ It also adds a timeout (5 seconds) to abort in case it has not
+ been able to detect the accesibility bus before the timeout expires.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner):
+ (TestRunner._wait_for_accessibility_bus):
+ (TestRunner._wait_for_accessibility_bus.timeout_accessibility_bus):
+ (TestRunner._start_accessibility_daemons):
+ (TestRunner._get_tests_from_google_test_suite): Run this command also with the driver test environment.
+
</ins><span class="cx"> 2016-08-26 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Warning fix.
</span></span></pre></div>
<a id="trunkToolsScriptsrungtktests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-gtk-tests (205016 => 205017)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-gtk-tests 2016-08-26 16:35:26 UTC (rev 205016)
+++ trunk/Tools/Scripts/run-gtk-tests 2016-08-26 16:36:29 UTC (rev 205017)
</span><span class="lines">@@ -153,6 +153,28 @@
</span><span class="cx">
</span><span class="cx"> return None
</span><span class="cx">
</span><ins>+ def _wait_for_accessibility_bus(self):
+ def timeout_accessibility_bus():
+ self._accessibility_bus_found = False
+ sys.stderr.write("Timeout waiting for the accesibility bus.\n")
+ sys.stderr.flush()
+ loop.quit()
+ # Backup current environment, and temporally set the test one.
+ oldenv = dict(os.environ)
+ os.environ.clear()
+ os.environ.update(self._test_env)
+ # We spin a main loop until the bus name appears on DBus.
+ self._accessibility_bus_found = True
+ loop = GLib.MainLoop()
+ Gio.bus_watch_name(Gio.BusType.SESSION, 'org.a11y.Bus', Gio.BusNameWatcherFlags.NONE,
+ lambda *args: loop.quit(), None)
+ GLib.timeout_add_seconds(5, timeout_accessibility_bus)
+ loop.run()
+ # Restore previous environment.
+ os.environ.clear()
+ os.environ.update(oldenv)
+ return self._accessibility_bus_found
+
</ins><span class="cx"> def _start_accessibility_daemons(self):
</span><span class="cx"> spi_bus_launcher_path = self._lookup_atspi2_binary('at-spi-bus-launcher')
</span><span class="cx"> spi_registryd_path = self._lookup_atspi2_binary('at-spi2-registryd')
</span><span class="lines">@@ -166,12 +188,11 @@
</span><span class="cx"> sys.stderr.flush()
</span><span class="cx"> return False
</span><span class="cx">
</span><del>- # We need to wait until the SPI bus is launched before trying to start the SPI
- # registry, so we spin a main loop until the bus name appears on DBus.
- loop = GLib.MainLoop()
- Gio.bus_watch_name(Gio.BusType.SESSION, 'org.a11y.Bus', Gio.BusNameWatcherFlags.NONE,
- lambda *args: loop.quit(), None)
- loop.run()
</del><ins>+ # We need to wait until the SPI bus is launched before trying to start the SPI registry.
+ if not self._wait_for_accessibility_bus():
+ sys.stderr.write("Failed checking the accessibility bus within D-Bus\n")
+ sys.stderr.flush()
+ return False
</ins><span class="cx">
</span><span class="cx"> try:
</span><span class="cx"> self._spi_registryd = subprocess.Popen([spi_registryd_path], env=self._test_env)
</span><span class="lines">@@ -330,7 +351,7 @@
</span><span class="cx">
</span><span class="cx"> def _get_tests_from_google_test_suite(self, test_program):
</span><span class="cx"> try:
</span><del>- output = subprocess.check_output([test_program, '--gtest_list_tests'])
</del><ins>+ output = subprocess.check_output([test_program, '--gtest_list_tests'], env=self._test_env)
</ins><span class="cx"> except subprocess.CalledProcessError:
</span><span class="cx"> sys.stderr.write("ERROR: could not list available tests for binary %s.\n" % (test_program))
</span><span class="cx"> sys.stderr.flush()
</span></span></pre>
</div>
</div>
</body>
</html>