Changeset 123085 in webkit

Timestamp:

Jul 19, 2012 2:59:39 AM (12 years ago)

Author:

commit-queue@webkit.org

Message:

[EFL][WK2] Using different cache directory for each WTR process
​https://bugs.webkit.org/show_bug.cgi?id=91719

Patch by Zoltan Nyul <​zoltan.nyul@intel.com> on 2012-07-19
Reviewed by Kenneth Rohde Christiansen.

Source/WebKit2:

Make sure we return a valid application cache directory in
WebContextEfl.

• UIProcess/efl/WebContextEfl.cpp:

(WebKit::WebContext::applicationCacheDirectory):

Tools:

The testrunner script may be running multiple processes in
parallel, and it makes appcache tests fail if they are using the same
directory. I modified the EFL's LayoutTestController to use the
DUMPRENDERTREE_TEMP for application cache directory because it's
different for each process.

• WebKitTestRunner/CMakeLists.txt:
• WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp:

(WTR::LayoutTestController::platformInitialize):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/efl/WebContextEfl.cpp (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/WebKitTestRunner/CMakeLists.txt (modified) (1 diff)
• Tools/WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2012-07-19  Zoltan Nyul  <zoltan.nyul@intel.com>
+
+        [EFL][WK2] Using different cache directory for each WTR process
+        https://bugs.webkit.org/show_bug.cgi?id=91719
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Make sure we return a valid application cache directory in
+        WebContextEfl.
+
+        * UIProcess/efl/WebContextEfl.cpp:
+        (WebKit::WebContext::applicationCacheDirectory):
+
 2012-07-18  Christophe Dumez  <christophe.dumez@intel.com>
 

trunk/Source/WebKit2/UIProcess/efl/WebContextEfl.cpp

@@ -28 +28 @@
 
 #include <WebCore/ApplicationCacheStorage.h>
+#include <WebCore/FileSystem.h>
 #include <WebCore/NotImplemented.h>
 
@@ -34 +35 @@
 String WebContext::applicationCacheDirectory()
 {
-    return WebCore::cacheStorage().cacheDirectory();
+    String cacheDir = WebCore::cacheStorage().cacheDirectory();
+    
+    // The WebKitTestRunner sets the cacheDirectory and
+    // we should not overwrite it.
+    if (cacheDir.isEmpty()) 
+        cacheDir = makeString(WebCore::homeDirectoryPath(), "/.webkit/Applications");
+
+    return cacheDir;
 }
 

trunk/Tools/ChangeLog

@@ +1 @@
+2012-07-19  Zoltan Nyul  <zoltan.nyul@intel.com>
+
+        [EFL][WK2] Using different cache directory for each WTR process
+        https://bugs.webkit.org/show_bug.cgi?id=91719
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        The testrunner script may be running multiple processes in
+        parallel, and it makes appcache tests fail if they are using the same
+        directory. I modified the EFL's LayoutTestController to use the
+        DUMPRENDERTREE_TEMP for application cache directory because it's
+        different for each process.
+
+        * WebKitTestRunner/CMakeLists.txt:
+        * WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp:
+        (WTR::LayoutTestController::platformInitialize):
+
 2012-07-19  Mario Sanchez Prada  <msanchez@igalia.com>
 

trunk/Tools/WebKitTestRunner/CMakeLists.txt

@@ -25 +25 @@
     ${JAVASCRIPTCORE_DIR}/ForwardingHeaders
     ${WEBCORE_DIR}/editing
+    ${WEBCORE_DIR}/page
     ${WEBCORE_DIR}/platform
     ${WEBCORE_DIR}/platform/graphics
     ${WEBCORE_DIR}/platform/network
+    ${WEBCORE_DIR}/platform/sql
     ${WEBCORE_DIR}/platform/text
     ${WEBCORE_DIR}/testing/js

trunk/Tools/WebKitTestRunner/InjectedBundle/efl/LayoutTestControllerEfl.cpp

@@ -23 +23 @@
 #include "InjectedBundle.h"
 #include <Ecore.h>
+#include <WebCore/ApplicationCacheStorage.h>
 
 namespace WTR {
@@ -34 +35 @@
 void LayoutTestController::platformInitialize()
 {
+    // The testrunner script is may be running multiple processes in parallel,
+    // and it makes appcache tests fail if they are using the same directory.
+    // DUMPRENDERTREE_TEMP points to a different directory for each process.
+    String appCacheDirectory = makeString(String::fromUTF8(getenv("DUMPRENDERTREE_TEMP")), "/Applications");
+    WebCore::cacheStorage().setCacheDirectory(appCacheDirectory);
     m_waitToDumpWatchdogTimer = 0;
 }