<!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>[174421] releases/WebKitGTK/webkit-2.6/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/174421">174421</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-10-08 00:30:16 -0700 (Wed, 08 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/174093">r174093</a> - [GTK] [EFL] Install TestNetscapePlugin apart from the other libs.
https://bugs.webkit.org/show_bug.cgi?id=137212
This moves TestNetscapePlugin to a new folder (lib/plugins).
We should not use the same directory for TestNetscapePlugin and
the other libraries, because we end up scanning all the .so in the
lib dir for every test.
Reviewed by Carlos Garcia Campos.
* DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Set LIBRARY_OUTPUT_DIRECTORY to lib/plugins.
* Scripts/webkitpy/port/efl.py:
(EflPort.setup_environ_for_server): Update plugin path.
* Scripts/webkitpy/port/gtk.py:
(GtkPort.setup_environ_for_server): Update plugin path.
* TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Update plugin path.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit26ToolsChangeLog">releases/WebKitGTK/webkit-2.6/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsDumpRenderTreeTestNetscapePlugInCMakeListstxt">releases/WebKitGTK/webkit-2.6/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsScriptswebkitpyporteflpy">releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/efl.py</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsScriptswebkitpyportgtkpy">releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/gtk.py</a></li>
<li><a href="#releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2GtkCMakeListstxt">releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit26ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/ChangeLog (174420 => 174421)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/ChangeLog 2014-10-08 07:30:16 UTC (rev 174421)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-09-29 Carlos Alberto Lopez Perez <clopez@igalia.com>
+
+ [GTK] [EFL] Install TestNetscapePlugin apart from the other libs.
+ https://bugs.webkit.org/show_bug.cgi?id=137212
+
+ This moves TestNetscapePlugin to a new folder (lib/plugins).
+ We should not use the same directory for TestNetscapePlugin and
+ the other libraries, because we end up scanning all the .so in the
+ lib dir for every test.
+
+ Reviewed by Carlos Garcia Campos.
+
+ * DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt: Set LIBRARY_OUTPUT_DIRECTORY to lib/plugins.
+ * Scripts/webkitpy/port/efl.py:
+ (EflPort.setup_environ_for_server): Update plugin path.
+ * Scripts/webkitpy/port/gtk.py:
+ (GtkPort.setup_environ_for_server): Update plugin path.
+ * TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt: Update plugin path.
+
</ins><span class="cx"> 2014-10-07 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [SOUP] TLS errors should take precedence over HTTP authentication
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsDumpRenderTreeTestNetscapePlugInCMakeListstxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt (174420 => 174421)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt 2014-10-08 07:30:16 UTC (rev 174421)
</span><span class="lines">@@ -44,3 +44,4 @@
</span><span class="cx">
</span><span class="cx"> add_library(TestNetscapePlugin SHARED ${WebKitTestNetscapePlugin_SOURCES})
</span><span class="cx"> target_link_libraries(TestNetscapePlugin ${WebKitTestNetscapePlugin_LIBRARIES})
</span><ins>+set_target_properties(TestNetscapePlugin PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins)
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsScriptswebkitpyporteflpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/efl.py (174420 => 174421)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/efl.py 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/efl.py 2014-10-08 07:30:16 UTC (rev 174421)
</span><span class="lines">@@ -65,7 +65,7 @@
</span><span class="cx"> del env['DISPLAY']
</span><span class="cx">
</span><span class="cx"> env['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
</span><del>- env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib')
</del><ins>+ env['TEST_RUNNER_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
</ins><span class="cx">
</span><span class="cx"> # Silence GIO warnings about using the "memory" GSettings backend.
</span><span class="cx"> env['GSETTINGS_BACKEND'] = 'memory'
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsScriptswebkitpyportgtkpy"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/gtk.py (174420 => 174421)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/gtk.py 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/Scripts/webkitpy/port/gtk.py 2014-10-08 07:30:16 UTC (rev 174421)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> environment['GSETTINGS_BACKEND'] = 'memory'
</span><span class="cx"> environment['LIBOVERLAY_SCROLLBAR'] = '0'
</span><span class="cx"> environment['TEST_RUNNER_INJECTED_BUNDLE_FILENAME'] = self._build_path('lib', 'libTestRunnerInjectedBundle.so')
</span><del>- environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib')
</del><ins>+ environment['TEST_RUNNER_TEST_PLUGIN_PATH'] = self._build_path('lib', 'plugins')
</ins><span class="cx"> self._copy_value_from_environ_if_set(environment, 'WEBKIT_OUTPUTDIR')
</span><span class="cx"> if self._driver_class() == XvfbDriver and self._should_use_jhbuild():
</span><span class="cx"> llvmpipe_libgl_path = self.host.executive.run_command(self._jhbuild_wrapper + ['printenv', 'LLVMPIPE_LIBGL_PATH'],
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit26ToolsTestWebKitAPITestsWebKit2GtkCMakeListstxt"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt (174420 => 174421)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2014-10-08 07:21:07 UTC (rev 174420)
+++ releases/WebKitGTK/webkit-2.6/Tools/TestWebKitAPI/Tests/WebKit2Gtk/CMakeLists.txt 2014-10-08 07:30:16 UTC (rev 174421)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> file(MAKE_DIRECTORY ${TEST_RESOURCES_DIR})
</span><span class="cx">
</span><span class="cx"> add_definitions(
</span><del>- -DWEBKIT_TEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}"
</del><ins>+ -DWEBKIT_TEST_PLUGIN_DIR="${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/plugins"
</ins><span class="cx"> -DWEBKIT_EXEC_PATH="${CMAKE_RUNTIME_OUTPUT_DIRECTORY}"
</span><span class="cx"> -DWEBKIT_SRC_DIR="${CMAKE_SOURCE_DIR}"
</span><span class="cx"> -DWEBKIT_TEST_WEB_EXTENSIONS_DIR="${TEST_LIBRARY_DIR}"
</span></span></pre>
</div>
</div>
</body>
</html>