<!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>[161857] trunk</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/161857">161857</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-01-12 20:09:39 -0800 (Sun, 12 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[EFL][WK2] Make API tests work again
https://bugs.webkit.org/show_bug.cgi?id=126769
Patch by Sergio Correia <sergio.correia@openbossa.org> on 2014-01-12
Reviewed by Gyuyoung Kim.
The EFL and WK2 test binaries are currently being generated at *TestWebKitAPI/
[E]WebKit2, respectively, and this causes problems because the logic to find
where WebProcess is to look in the same directory of the running process and
then proceed to use LIBEXECDIR (typically /usr/loca/bin).
This patch introduces a WEBKIT_EXEC_PATH environment variable, inspired in the
Gtk port, which allows us to look for WebProcess initially in this directory,
if it's defined.
.:
* Source/cmake/OptionsEfl.cmake: Define WEBKIT_EXEC_PATH, to be used by
[E]WebKit2 tests.
Source/WebKit2:
* Shared/efl/ProcessExecutablePathEfl.cpp:
(WebKit::findProcessPath): Change the logic to look initially in
WEBKIT_EXEC_PATH, then proceed with the existing checks.
* UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp:
(EWK2UnitTest::EWK2UnitTestEnvironment::EWK2UnitTestEnvironment):
Define WEBKIT_EXEC_PATH to be used by EWebKit2 tests.
Tools:
* TestWebKitAPI/efl/main.cpp:
(main): Define WEBKIT_EXEC_PATH to be used by WebKit2 API tests.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkChangeLog">trunk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedeflProcessExecutablePathEflcpp">trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIefltestsUnitTestUtilsEWK2UnitTestEnvironmentcpp">trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp</a></li>
<li><a href="#trunkSourcecmakeOptionsEflcmake">trunk/Source/cmake/OptionsEfl.cmake</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPIeflmaincpp">trunk/Tools/TestWebKitAPI/efl/main.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/ChangeLog (161856 => 161857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/ChangeLog 2014-01-13 04:03:56 UTC (rev 161856)
+++ trunk/ChangeLog 2014-01-13 04:09:39 UTC (rev 161857)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-12 Sergio Correia <sergio.correia@openbossa.org>
+
+ [EFL][WK2] Make API tests work again
+ https://bugs.webkit.org/show_bug.cgi?id=126769
+
+ Reviewed by Gyuyoung Kim.
+
+ The EFL and WK2 test binaries are currently being generated at *TestWebKitAPI/
+ [E]WebKit2, respectively, and this causes problems because the logic to find
+ where WebProcess is to look in the same directory of the running process and
+ then proceed to use LIBEXECDIR (typically /usr/loca/bin).
+
+ This patch introduces a WEBKIT_EXEC_PATH environment variable, inspired in the
+ Gtk port, which allows us to look for WebProcess initially in this directory,
+ if it's defined.
+
+ * Source/cmake/OptionsEfl.cmake: Define WEBKIT_EXEC_PATH, to be used by
+ [E]WebKit2 tests.
+
</ins><span class="cx"> 2014-01-11 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Mac] xcodebuild color output is suppressed when using make
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (161856 => 161857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-01-13 04:03:56 UTC (rev 161856)
+++ trunk/Source/WebKit2/ChangeLog 2014-01-13 04:09:39 UTC (rev 161857)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2014-01-12 Sergio Correia <sergio.correia@openbossa.org>
+
+ [EFL][WK2] Make API tests work again
+ https://bugs.webkit.org/show_bug.cgi?id=126769
+
+ Reviewed by Gyuyoung Kim.
+
+ The EFL and WK2 test binaries are currently being generated at *TestWebKitAPI/
+ [E]WebKit2, respectively, and this causes problems because the logic to find
+ where WebProcess is to look in the same directory of the running process and
+ then proceed to use LIBEXECDIR (typically /usr/loca/bin).
+
+ This patch introduces a WEBKIT_EXEC_PATH environment variable, inspired in the
+ Gtk port, which allows us to look for WebProcess initially in this directory,
+ if it's defined.
+
+ * Shared/efl/ProcessExecutablePathEfl.cpp:
+ (WebKit::findProcessPath): Change the logic to look initially in
+ WEBKIT_EXEC_PATH, then proceed with the existing checks.
+ * UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp:
+ (EWK2UnitTest::EWK2UnitTestEnvironment::EWK2UnitTestEnvironment):
+ Define WEBKIT_EXEC_PATH to be used by EWebKit2 tests.
+
</ins><span class="cx"> 2014-01-12 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Add deprecatedCharacters as a synonym for characters and convert most call sites
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedeflProcessExecutablePathEflcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp (161856 => 161857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp 2014-01-13 04:03:56 UTC (rev 161856)
+++ trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp 2014-01-13 04:09:39 UTC (rev 161857)
</span><span class="lines">@@ -28,16 +28,24 @@
</span><span class="cx">
</span><span class="cx"> #include "FileSystem.h"
</span><span class="cx"> #include <libgen.h>
</span><del>-#include <sys/stat.h>
-#include <sys/types.h>
</del><span class="cx"> #include <unistd.h>
</span><span class="cx"> #include <wtf/StdLibExtras.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><ins>+// We initially look for the process in WEBKIT_EXEC_PATH, then proceed to try the working
+// directory of the running process, and finally we try LIBEXECDIR (usually /usr/local/bin).
</ins><span class="cx"> static String findProcessPath(const char* processName)
</span><span class="cx"> {
</span><ins>+ String executablePath;
+ static const char* execDirectory = getenv("WEBKIT_EXEC_PATH");
+ if (execDirectory) {
+ executablePath = WebCore::pathByAppendingComponent(String::fromUTF8(execDirectory), processName);
+ if (WebCore::fileExists(executablePath))
+ return executablePath;
+ }
+
</ins><span class="cx"> #if OS(UNIX)
</span><span class="cx"> char readLinkBuffer[PATH_MAX] = {0};
</span><span class="cx">
</span><span class="lines">@@ -48,16 +56,14 @@
</span><span class="cx"> #endif
</span><span class="cx"> if (result > 0) {
</span><span class="cx"> char* executablePathPtr = dirname(readLinkBuffer);
</span><del>- String executablePath = WebCore::pathByAppendingComponent(String(executablePathPtr), processName);
-
- // Checks whether process exist on the current path.
- struct stat fileStat;
- if (!stat(executablePath.utf8().data(), &fileStat))
</del><ins>+ executablePath = WebCore::pathByAppendingComponent(String::fromUTF8(executablePathPtr), processName);
+ if (WebCore::fileExists(executablePath))
</ins><span class="cx"> return executablePath;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><del>-
- return WebCore::pathByAppendingComponent(String(LIBEXECDIR), processName);
</del><ins>+ executablePath = WebCore::pathByAppendingComponent(String(LIBEXECDIR), processName);
+ ASSERT(WebCore::fileExists(executablePath));
+ return executablePath;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String executablePathOfWebProcess()
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIefltestsUnitTestUtilsEWK2UnitTestEnvironmentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp (161856 => 161857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp 2014-01-13 04:03:56 UTC (rev 161856)
+++ trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp 2014-01-13 04:09:39 UTC (rev 161857)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> : m_defaultWidth(800)
</span><span class="cx"> , m_defaultHeight(600)
</span><span class="cx"> {
</span><ins>+ setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, false);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const char* EWK2UnitTestEnvironment::defaultTestPageUrl() const
</span></span></pre></div>
<a id="trunkSourcecmakeOptionsEflcmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/cmake/OptionsEfl.cmake (161856 => 161857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/cmake/OptionsEfl.cmake 2014-01-13 04:03:56 UTC (rev 161856)
+++ trunk/Source/cmake/OptionsEfl.cmake 2014-01-13 04:09:39 UTC (rev 161857)
</span><span class="lines">@@ -287,3 +287,6 @@
</span><span class="cx"> find_package(LLVM REQUIRED)
</span><span class="cx"> set(HAVE_LLVM ON)
</span><span class="cx"> endif ()
</span><ins>+
+# [E]WebKit2 tests need a hint to find out where processes such as WebProcess are located at.
+add_definitions(-DWEBKIT_EXEC_PATH=\"${CMAKE_RUNTIME_OUTPUT_DIRECTORY}\")
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (161856 => 161857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2014-01-13 04:03:56 UTC (rev 161856)
+++ trunk/Tools/ChangeLog 2014-01-13 04:09:39 UTC (rev 161857)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-01-12 Sergio Correia <sergio.correia@openbossa.org>
+
+ [EFL][WK2] Make API tests work again
+ https://bugs.webkit.org/show_bug.cgi?id=126769
+
+ Reviewed by Gyuyoung Kim.
+
+ The EFL and WK2 test binaries are currently being generated at *TestWebKitAPI/
+ [E]WebKit2, respectively, and this causes problems because the logic to find
+ where WebProcess is to look in the same directory of the running process and
+ then proceed to use LIBEXECDIR (typically /usr/loca/bin).
+
+ This patch introduces a WEBKIT_EXEC_PATH environment variable, inspired in the
+ Gtk port, which allows us to look for WebProcess initially in this directory,
+ if it's defined.
+
+ * TestWebKitAPI/efl/main.cpp:
+ (main): Define WEBKIT_EXEC_PATH to be used by WebKit2 API tests.
+
</ins><span class="cx"> 2014-01-12 Daniel Bates <dabates@apple.com>
</span><span class="cx">
</span><span class="cx"> [iOS] Fix the build
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPIeflmaincpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/efl/main.cpp (161856 => 161857)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/efl/main.cpp 2014-01-13 04:03:56 UTC (rev 161856)
+++ trunk/Tools/TestWebKitAPI/efl/main.cpp 2014-01-13 04:09:39 UTC (rev 161857)
</span><span class="lines">@@ -50,6 +50,7 @@
</span><span class="cx"> int main(int argc, char** argv)
</span><span class="cx"> {
</span><span class="cx"> WTFInstallReportBacktraceOnCrashHook();
</span><ins>+ setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, false);
</ins><span class="cx">
</span><span class="cx"> if (!eina_init())
</span><span class="cx"> return EXIT_FAILURE;
</span></span></pre>
</div>
</div>
</body>
</html>