<!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>[169614] 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/169614">169614</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-06-05 06:45:17 -0700 (Thu, 05 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] run-perf-tests should run the tests inside the jhbuild shell.
https://bugs.webkit.org/show_bug.cgi?id=133533
Patch by Carlos Alberto Lopez Perez <clopez@igalia.com> on 2014-06-05
Reviewed by Carlos Garcia Campos.
* Scripts/webkitpy/common/multiprocessing_bootstrap.py:
(run): Remove the jhbuild-wrapper wrapper from here. It should be
on Scripts/webkitpy/port/gtk.py.
* Scripts/webkitpy/port/base.py:
(Port.set_option): Add a set_option(name, value) function to set
the optparse parameter "name" to the value "value", even if the
parameter "name" is already initialized.
* Scripts/webkitpy/port/gtk.py:
(GtkPort.__init__): Set the default wrapper to jhbuild-wrapper.
If another wrapper is specified via the option "-l --wrapper=x",
then prepend the jhbuild-wrapper to the one specified.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonmultiprocessing_bootstrappy">trunk/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportbasepy">trunk/Tools/Scripts/webkitpy/port/base.py</a></li>
<li><a href="#trunkToolsScriptswebkitpyportgtkpy">trunk/Tools/Scripts/webkitpy/port/gtk.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (169613 => 169614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-06-05 12:47:00 UTC (rev 169613)
+++ trunk/Tools/ChangeLog 2014-06-05 13:45:17 UTC (rev 169614)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-06-05 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] run-perf-tests should run the tests inside the jhbuild shell.
+ https://bugs.webkit.org/show_bug.cgi?id=133533
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Scripts/webkitpy/common/multiprocessing_bootstrap.py:
+ (run): Remove the jhbuild-wrapper wrapper from here. It should be
+ on Scripts/webkitpy/port/gtk.py.
+ * Scripts/webkitpy/port/base.py:
+ (Port.set_option): Add a set_option(name, value) function to set
+ the optparse parameter "name" to the value "value", even if the
+ parameter "name" is already initialized.
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.__init__): Set the default wrapper to jhbuild-wrapper.
+ If another wrapper is specified via the option "-l --wrapper=x",
+ then prepend the jhbuild-wrapper to the one specified.
+
</ins><span class="cx"> 2014-06-04 David Farler <dfarler@apple.com>
</span><span class="cx">
</span><span class="cx"> Build ASan WebKit for iOS Simulator
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonmultiprocessing_bootstrappy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py (169613 => 169614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py 2014-06-05 12:47:00 UTC (rev 169613)
+++ trunk/Tools/Scripts/webkitpy/common/multiprocessing_bootstrap.py 2014-06-05 13:45:17 UTC (rev 169614)
</span><span class="lines">@@ -53,13 +53,6 @@
</span><span class="cx"> module_path = os.path.join(script_dir, *parts)
</span><span class="cx"> cmd = [sys.executable, module_path] + sys.argv[1:]
</span><span class="cx">
</span><del>- # Wrap processes in the jhbuild environment so DRT or WKTR
- # doesn't need to do it and their process id as reported by
- # subprocess.Popen is not jhbuild's.
- if '--gtk' in sys.argv[1:] and os.path.exists(os.path.join(script_dir, '..', '..', 'WebKitBuild', 'Dependencies')):
- prefix = [os.path.join(script_dir, '..', 'jhbuild', 'jhbuild-wrapper'), '--gtk', 'run']
- cmd = prefix + cmd
-
</del><span class="cx"> proc = subprocess.Popen(cmd, env=env)
</span><span class="cx"> try:
</span><span class="cx"> proc.wait()
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportbasepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/base.py (169613 => 169614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/base.py 2014-06-05 12:47:00 UTC (rev 169613)
+++ trunk/Tools/Scripts/webkitpy/port/base.py 2014-06-05 13:45:17 UTC (rev 169614)
</span><span class="lines">@@ -735,6 +735,10 @@
</span><span class="cx"> def get_option(self, name, default_value=None):
</span><span class="cx"> return getattr(self._options, name, default_value)
</span><span class="cx">
</span><ins>+ def set_option(self, name, value):
+ setattr(self._options, name, value)
+ return self.get_option(name) == value
+
</ins><span class="cx"> def set_option_default(self, name, default_value):
</span><span class="cx"> return self._options.ensure_value(name, default_value)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (169613 => 169614)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-06-05 12:47:00 UTC (rev 169613)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-06-05 13:45:17 UTC (rev 169614)
</span><span class="lines">@@ -54,6 +54,13 @@
</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><ins>+ if os.path.exists(self.path_from_webkit_base('WebKitBuild', 'Dependencies')):
+ self._jhbuild_wrapper = [self.path_from_webkit_base('Tools', 'jhbuild', 'jhbuild-wrapper'), '--gtk', 'run']
+ if self.get_option('wrapper'):
+ self.set_option('wrapper', ' '.join(self._jhbuild_wrapper) + ' ' + self.get_option('wrapper'))
+ else:
+ self.set_option_default('wrapper', ' '.join(self._jhbuild_wrapper))
+
</ins><span class="cx"> def _built_executables_path(self, *path):
</span><span class="cx"> return self._build_path(*(('bin',) + path))
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>