Changeset 161857 in webkit

Timestamp:

Jan 12, 2014 8:09:39 PM (10 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Make API tests work again
​https://bugs.webkit.org/show_bug.cgi?id=126769

Patch by Sergio Correia <Sergio Correia> 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.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp (modified) (3 diffs)
• Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp (modified) (1 diff)
• Source/cmake/OptionsEfl.cmake (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/efl/main.cpp (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+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.
+
 2014-01-11  Dan Bernstein  <mitz@apple.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+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.
+
 2014-01-12  Darin Adler  <darin@apple.com>
 

trunk/Source/WebKit2/Shared/efl/ProcessExecutablePathEfl.cpp

@@ -29 +29 @@
 #include "FileSystem.h"
 #include <libgen.h>
-#include <sys/stat.h>
-#include <sys/types.h>
 #include <unistd.h>
 #include <wtf/StdLibExtras.h>
@@ -37 +35 @@
 namespace WebKit {
 
+// 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).
 static String findProcessPath(const char* processName)
 {
+    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;
+    }
+
 #if OS(UNIX)
     char readLinkBuffer[PATH_MAX] = {0};
@@ -49 +57 @@
     if (result > 0) {
         char* executablePathPtr = dirname(readLinkBuffer);
-        String executablePath = WebCore::pathByAppendingComponent(String(executablePathPtr), processName);
-
-        // Checks whether process exist on the current path.
-        struct stat fileStat;
-        if (!stat(executablePath.utf8().data(), &fileStat))
+        executablePath = WebCore::pathByAppendingComponent(String::fromUTF8(executablePathPtr), processName);
+        if (WebCore::fileExists(executablePath))
             return executablePath;
     }
 #endif
-
-    return WebCore::pathByAppendingComponent(String(LIBEXECDIR), processName);
+    executablePath = WebCore::pathByAppendingComponent(String(LIBEXECDIR), processName);
+    ASSERT(WebCore::fileExists(executablePath));
+    return executablePath;
 }
 

trunk/Source/WebKit2/UIProcess/API/efl/tests/UnitTestUtils/EWK2UnitTestEnvironment.cpp

@@ -31 +31 @@
     , m_defaultHeight(600)
 {
+    setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, false);
 }
 

trunk/Source/cmake/OptionsEfl.cmake

@@ -288 +288 @@
     set(HAVE_LLVM ON)
 endif ()
+
+# [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}\")

trunk/Tools/ChangeLog

@@ +1 @@
+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.
+
 2014-01-12  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/TestWebKitAPI/efl/main.cpp

@@ -51 +51 @@
 {
     WTFInstallReportBacktraceOnCrashHook();
+    setenv("WEBKIT_EXEC_PATH", WEBKIT_EXEC_PATH, false);
 
     if (!eina_init())