<!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>[161214] 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/161214">161214</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-02 11:45:58 -0800 (Thu, 02 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [CMake] run-gtk-tests should run with the cmake build
https://bugs.webkit.org/show_bug.cgi?id=126341
Reviewed by Carlos Garcia Campos.
* Scripts/run-gtk-tests:
(TestRunner.__init__): Use the new calling conventions for the common script.
(TestRunner._setup_testing_environment): Ditto.
* gtk/common.py:
(set_build_types): Added set_build_types, to avoid having build_type arguments
for all functions in common.
(binary_build_path): Added this function which gets the path to the built binaries.
(get_build_path): Removed the build_types argument.
(build_path): Removed the build_types argument and call get_build_path directly now.</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="#trunkToolsgtkcommonpy">trunk/Tools/gtk/common.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161213 => 161214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-02 19:42:11 UTC (rev 161213)
+++ trunk/Tools/ChangeLog 2014-01-02 19:45:58 UTC (rev 161214)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-01-02 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] run-gtk-tests should run with the cmake build
+ https://bugs.webkit.org/show_bug.cgi?id=126341
+
+ Reviewed by Carlos Garcia Campos.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner.__init__): Use the new calling conventions for the common script.
+ (TestRunner._setup_testing_environment): Ditto.
+ * gtk/common.py:
+ (set_build_types): Added set_build_types, to avoid having build_type arguments
+ for all functions in common.
+ (binary_build_path): Added this function which gets the path to the built binaries.
+ (get_build_path): Removed the build_types argument.
+ (build_path): Removed the build_types argument and call get_build_path directly now.
+
</ins><span class="cx"> 2014-01-02 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=126391
</span></span></pre></div>
<a id="trunkToolsScriptsrungtktests"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-gtk-tests (161213 => 161214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-gtk-tests 2014-01-02 19:42:11 UTC (rev 161213)
+++ trunk/Tools/Scripts/run-gtk-tests 2014-01-02 19:45:58 UTC (rev 161214)
</span><span class="lines">@@ -91,9 +91,11 @@
</span><span class="cx">
</span><span class="cx"> def __init__(self, options, tests=[]):
</span><span class="cx"> self._options = options
</span><ins>+
</ins><span class="cx"> self._build_type = "Debug" if self._options.debug else "Release"
</span><ins>+ common.set_build_types((self._build_type,))
</ins><span class="cx">
</span><del>- self._programs_path = common.build_path_for_build_types((self._build_type,), "Programs")
</del><ins>+ self._programs_path = common.binary_build_path()
</ins><span class="cx"> self._tests = self._get_tests(tests)
</span><span class="cx"> self._skipped_tests = TestRunner.SKIPPED
</span><span class="cx"> self._disabled_tests = []
</span><span class="lines">@@ -194,7 +196,7 @@
</span><span class="cx"> self._test_env = os.environ
</span><span class="cx"> self._test_env['GSETTINGS_BACKEND'] = 'memory'
</span><span class="cx"> self._test_env["TEST_WEBKIT_API_WEBKIT2_RESOURCES_PATH"] = common.top_level_path("Tools", "TestWebKitAPI", "Tests", "WebKit2")
</span><del>- self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.build_path_for_build_types((self._build_type,), "Libraries")
</del><ins>+ self._test_env["TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"] = common.library_build_path()
</ins><span class="cx"> self._test_env["WEBKIT_EXEC_PATH"] = self._programs_path
</span><span class="cx">
</span><span class="cx"> if not self._run_xvfb():
</span></span></pre></div>
<a id="trunkToolsgtkcommonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/common.py (161213 => 161214)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/common.py 2014-01-02 19:42:11 UTC (rev 161213)
+++ trunk/Tools/gtk/common.py 2014-01-02 19:45:58 UTC (rev 161214)
</span><span class="lines">@@ -25,8 +25,14 @@
</span><span class="cx"> build_dir = None
</span><span class="cx"> library_build_dir = None
</span><span class="cx"> is_cmake = None
</span><ins>+build_types = ('Release', 'Debug')
</ins><span class="cx">
</span><span class="cx">
</span><ins>+def set_build_types(new_build_types):
+ global build_types
+ build_types = new_build_types
+
+
</ins><span class="cx"> def is_cmake_build():
</span><span class="cx"> global is_cmake
</span><span class="cx"> if is_cmake is None:
</span><span class="lines">@@ -44,6 +50,16 @@
</span><span class="cx"> return library_build_dir
</span><span class="cx">
</span><span class="cx">
</span><ins>+def binary_build_path(*args):
+ global library_build_dir
+ if not library_build_dir:
+ if is_cmake_build():
+ library_build_dir = build_path('bin', *args)
+ else:
+ library_build_dir = build_path('Programs', *args)
+ return library_build_dir
+
+
</ins><span class="cx"> def script_path(*args):
</span><span class="cx"> global script_dir
</span><span class="cx"> if not script_dir:
</span><span class="lines">@@ -55,7 +71,7 @@
</span><span class="cx"> return os.path.join(*((os.path.join(os.path.dirname(__file__), '..', '..'),) + args))
</span><span class="cx">
</span><span class="cx">
</span><del>-def get_build_path(build_types=('Release', 'Debug'), fatal=True):
</del><ins>+def get_build_path(fatal=True):
</ins><span class="cx"> global build_dir
</span><span class="cx"> if build_dir:
</span><span class="cx"> return build_dir
</span><span class="lines">@@ -80,6 +96,7 @@
</span><span class="cx"> if is_valid_build_directory(build_dir):
</span><span class="cx"> return build_dir
</span><span class="cx">
</span><ins>+ global build_types
</ins><span class="cx"> for build_type in build_types:
</span><span class="cx"> build_dir = top_level_path('WebKitBuild', build_type)
</span><span class="cx"> if is_valid_build_directory(build_dir):
</span><span class="lines">@@ -103,12 +120,8 @@
</span><span class="cx"> sys.exit(1)
</span><span class="cx">
</span><span class="cx">
</span><del>-def build_path_for_build_types(build_types, *args):
- return os.path.join(*(get_build_path(build_types),) + args)
-
-
</del><span class="cx"> def build_path(*args):
</span><del>- return build_path_for_build_types(('Release', 'Debug'), *args)
</del><ins>+ return os.path.join(*(get_build_path(),) + args)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def pkg_config_file_variable(package, variable):
</span></span></pre>
</div>
</div>
</body>
</html>