Skip to content
  • commit-queue@webkit.org's avatar
    [EFL][WK2] Make API tests work again · 56469cec
    commit-queue@webkit.org authored
    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.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@161857 268f45cc-cd09-0410-ab3c-d52691b4dbfc
    56469cec