<!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>[162585] 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/162585">162585</a></dd>
<dt>Author</dt> <dd>mrobinson@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-22 19:50:08 -0800 (Wed, 22 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [CMake] run-webkit-tests should support the CMake build
https://bugs.webkit.org/show_bug.cgi?id=126503
Reviewed by Daniel Bates.
Update run-launcher and gtk.py to work properly when dealing with the CMake port.
run-webkit-tests does not need the --gtkcmake flag, but run-launcher does.
* Scripts/run-launcher: Work properly with the gtkcmake flag.
* Scripts/webkitpy/port/gtk.py:
(GtkPort._is_cmake_build): Added this helper which looks for the CMakeCache
file to detect a CMake build.
(GtkPort._built_executables_path): Added this helper to locate the built executable path.
(GtkPort._built_libraries_path): Added this helper to locate the built library path.
(GtkPort._port_flag_for_scripts): Use --gtkcmake when appropriate.
(GtkPort.setup_environ_for_server): The way CMake builds libraries differs from GTK+.
(GtkPort._path_to_driver): Use the new helper.
(GtkPort._path_to_image_diff): Use the new Helper.
(GtkPort._path_to_webcore_library): Use the new helper.
(GtkPort.build_webkit_command): Use --gtkcmake when appropriate.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptsrunlauncher">trunk/Tools/Scripts/run-launcher</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 (162584 => 162585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-23 03:09:37 UTC (rev 162584)
+++ trunk/Tools/ChangeLog 2014-01-23 03:50:08 UTC (rev 162585)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-05 Martin Robinson <mrobinson@igalia.com>
+
+ [GTK] [CMake] run-webkit-tests should support the CMake build
+ https://bugs.webkit.org/show_bug.cgi?id=126503
+
+ Reviewed by Daniel Bates.
+
+ Update run-launcher and gtk.py to work properly when dealing with the CMake port.
+ run-webkit-tests does not need the --gtkcmake flag, but run-launcher does.
+
+ * Scripts/run-launcher: Work properly with the gtkcmake flag.
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort._is_cmake_build): Added this helper which looks for the CMakeCache
+ file to detect a CMake build.
+ (GtkPort._built_executables_path): Added this helper to locate the built executable path.
+ (GtkPort._built_libraries_path): Added this helper to locate the built library path.
+ (GtkPort._port_flag_for_scripts): Use --gtkcmake when appropriate.
+ (GtkPort.setup_environ_for_server): The way CMake builds libraries differs from GTK+.
+ (GtkPort._path_to_driver): Use the new helper.
+ (GtkPort._path_to_image_diff): Use the new Helper.
+ (GtkPort._path_to_webcore_library): Use the new helper.
+ (GtkPort.build_webkit_command): Use --gtkcmake when appropriate.
+
</ins><span class="cx"> 2014-01-22 Ryuan Choi <ryuan.choi@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Remove unnecessary smart method since ewk_view_tiled removed
</span></span></pre></div>
<a id="trunkToolsScriptsrunlauncher"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/run-launcher (162584 => 162585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/run-launcher 2014-01-23 03:09:37 UTC (rev 162584)
+++ trunk/Tools/Scripts/run-launcher 2014-01-23 03:50:08 UTC (rev 162585)
</span><span class="lines">@@ -46,10 +46,16 @@
</span><span class="cx">
</span><span class="cx"> # Set paths according to the build system used
</span><span class="cx"> if (isGtk()) {
</span><ins>+ if (isGtkAutotools()) {
+ $launcherPath = catdir($productDir, "Programs");
+ } else {
+ $launcherPath = catdir($productDir, "bin");
+ }
+
</ins><span class="cx"> if (isWK2()) {
</span><del>- $launcherPath = catdir($productDir, "Programs", "MiniBrowser");
</del><ins>+ $launcherPath = catdir($launcherPath, "MiniBrowser");
</ins><span class="cx"> } else {
</span><del>- $launcherPath = catdir($productDir, "Programs", "GtkLauncher");
</del><ins>+ $launcherPath = catdir($launcherPath, "GtkLauncher");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/gtk.py (162584 => 162585)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-01-23 03:09:37 UTC (rev 162584)
+++ trunk/Tools/Scripts/webkitpy/port/gtk.py 2014-01-23 03:50:08 UTC (rev 162585)
</span><span class="lines">@@ -53,11 +53,29 @@
</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>+ def _is_cmake_build(self):
+ return os.path.exists(self._build_path('CMakeCache.txt'))
+
+ def _built_executables_path(self, *path):
+ if self._is_cmake_build():
+ return self._build_path(*(('bin',) + path))
+ else:
+ return self._build_path(*(('Programs',) + path))
+
+ def _built_libraries_path(self, *path):
+ if self._is_cmake_build():
+ return self._build_path(*(('lib',) + path))
+ else:
+ return self._build_path(*(('.libs',) + path))
+
</ins><span class="cx"> def warn_if_bug_missing_in_test_expectations(self):
</span><span class="cx"> return not self.get_option('webkit_test_runner')
</span><span class="cx">
</span><span class="cx"> def _port_flag_for_scripts(self):
</span><del>- return "--gtk"
</del><ins>+ if self._is_cmake_build():
+ return "--gtkcmake"
+ else:
+ return "--gtk"
</ins><span class="cx">
</span><span class="cx"> @memoized
</span><span class="cx"> def _driver_class(self):
</span><span class="lines">@@ -94,8 +112,12 @@
</span><span class="cx"> environment = super(GtkPort, self).setup_environ_for_server(server_name)
</span><span class="cx"> environment['GSETTINGS_BACKEND'] = 'memory'
</span><span class="cx"> environment['LIBOVERLAY_SCROLLBAR'] = '0'
</span><del>- environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('Libraries', 'libTestRunnerInjectedBundle.la')
- environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('TestNetscapePlugin', '.libs')
</del><ins>+ if self._is_cmake_build():
+ environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
+ environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib')
+ else:
+ environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('Libraries', 'libTestRunnerInjectedBundle.la')
+ environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('TestNetscapePlugin', '.libs')
</ins><span class="cx"> environment['AUDIO_RESOURCES_PATH'] = self.path_from_webkit_base('Source', 'WebCore', 'platform', 'audio', 'resources')
</span><span class="cx"> self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
</span><span class="cx"> if self.get_option("leaks"):
</span><span class="lines">@@ -130,10 +152,10 @@
</span><span class="cx"> return configurations
</span><span class="cx">
</span><span class="cx"> def _path_to_driver(self):
</span><del>- return self._build_path('Programs', self.driver_name())
</del><ins>+ return self._built_executables_path(self.driver_name())
</ins><span class="cx">
</span><span class="cx"> def _path_to_image_diff(self):
</span><del>- return self._build_path('Programs', 'ImageDiff')
</del><ins>+ return self._built_executables_path('ImageDiff')
</ins><span class="cx">
</span><span class="cx"> def _path_to_webcore_library(self):
</span><span class="cx"> gtk_library_names = [
</span><span class="lines">@@ -143,7 +165,7 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> for library in gtk_library_names:
</span><del>- full_library = self._build_path(".libs", library)
</del><ins>+ full_library = self._built_libraries_path(library)
</ins><span class="cx"> if self._filesystem.isfile(full_library):
</span><span class="cx"> return full_library
</span><span class="cx"> return None
</span><span class="lines">@@ -192,11 +214,16 @@
</span><span class="cx">
</span><span class="cx"> def build_webkit_command(self, build_style=None):
</span><span class="cx"> command = super(GtkPort, self).build_webkit_command(build_style)
</span><del>- command.extend(["--gtk", "--update-gtk"])
</del><ins>+ if self._is_cmake_build():
+ command.extend(["--gtkcmake", "--update-gtk"])
+ else:
+ command.extend(["--gtk", "--update-gtk"])
+
</ins><span class="cx"> if self.get_option('webkit_test_runner'):
</span><span class="cx"> command.append("--no-webkit1")
</span><span class="cx"> else:
</span><span class="cx"> command.append("--no-webkit2")
</span><ins>+
</ins><span class="cx"> command.append(super(GtkPort, self).make_args())
</span><span class="cx"> return command
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>