<!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>[168526] 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/168526">168526</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-09 05:49:54 -0700 (Fri, 09 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>REGRESSION(CMAKE): [GTK] run-gtk-tests doesn't set the right injected bundle path
https://bugs.webkit.org/show_bug.cgi?id=132736
Reviewed by Philippe Normand.
There are two problems, the path returned by common.library_build_path() is wrong when
common.binary_build_path() has previously been called, and the test is still looking for
the .la instead of .so
* TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp:
(TestWebKitAPI::Util::createInjectedBundlePath): Use .so instead
of .la as extension of the injected bundle library.
* gtk/common.py:
(binary_build_path): Remove unused global variable and add a new
one for binary_build_dir instead of sharing the same global
variable for library_build_path and binary_build_path.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIgtkPlatformUtilitiesGtkcpp">trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp</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 (168525 => 168526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-05-09 12:49:26 UTC (rev 168525)
+++ trunk/Tools/ChangeLog 2014-05-09 12:49:54 UTC (rev 168526)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-05-09 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ REGRESSION(CMAKE): [GTK] run-gtk-tests doesn't set the right injected bundle path
+ https://bugs.webkit.org/show_bug.cgi?id=132736
+
+ Reviewed by Philippe Normand.
+
+ There are two problems, the path returned by common.library_build_path() is wrong when
+ common.binary_build_path() has previously been called, and the test is still looking for
+ the .la instead of .so
+
+ * TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp:
+ (TestWebKitAPI::Util::createInjectedBundlePath): Use .so instead
+ of .la as extension of the injected bundle library.
+ * gtk/common.py:
+ (binary_build_path): Remove unused global variable and add a new
+ one for binary_build_dir instead of sharing the same global
+ variable for library_build_path and binary_build_path.
+
</ins><span class="cx"> 2014-05-08 Praveen R Jadhav <praveen.j@samsung.com>
</span><span class="cx">
</span><span class="cx"> [EFL] Enable MEDIA_STREAM for EFL port
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIgtkPlatformUtilitiesGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp (168525 => 168526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp 2014-05-09 12:49:26 UTC (rev 168525)
+++ trunk/Tools/TestWebKitAPI/gtk/PlatformUtilitiesGtk.cpp 2014-05-09 12:49:54 UTC (rev 168526)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> WKStringRef createInjectedBundlePath()
</span><span class="cx"> {
</span><span class="cx"> GUniquePtr<char> injectedBundlePath(getFilenameFromEnvironmentVariableAsUTF8("TEST_WEBKIT_API_WEBKIT2_INJECTED_BUNDLE_PATH"));
</span><del>- GUniquePtr<char> injectedBundleFilename(g_build_filename(injectedBundlePath.get(), "libTestWebKitAPIInjectedBundle.la", nullptr));
</del><ins>+ GUniquePtr<char> injectedBundleFilename(g_build_filename(injectedBundlePath.get(), "libTestWebKitAPIInjectedBundle.so", nullptr));
</ins><span class="cx"> return WKStringCreateWithUTF8CString(injectedBundleFilename.get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsgtkcommonpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/gtk/common.py (168525 => 168526)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/gtk/common.py 2014-05-09 12:49:26 UTC (rev 168525)
+++ trunk/Tools/gtk/common.py 2014-05-09 12:49:54 UTC (rev 168526)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> top_level_dir = None
</span><span class="cx"> build_dir = None
</span><span class="cx"> library_build_dir = None
</span><del>-tests_library_build_dir = None
</del><ins>+binary_build_dir = None
</ins><span class="cx"> build_types = ('Release', 'Debug')
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -48,10 +48,10 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def binary_build_path(*args):
</span><del>- global library_build_dir
- if not library_build_dir:
- library_build_dir = build_path('bin', *args)
- return library_build_dir
</del><ins>+ global binary_build_dir
+ if not binary_build_dir:
+ binary_build_dir = build_path('bin', *args)
+ return binary_build_dir
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def get_build_path(fatal=True):
</span></span></pre>
</div>
</div>
</body>
</html>