Unreviewed, rolling out r128453.
authorzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Sep 2012 19:21:26 +0000 (19:21 +0000)
committerzandobersek@gmail.com <zandobersek@gmail.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Sep 2012 19:21:26 +0000 (19:21 +0000)
http://trac.webkit.org/changeset/128453
https://bugs.webkit.org/show_bug.cgi?id=96681

Having tests use the same appcache directory leads to timeouts
(Requested by zdobersek on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2012-09-13

Source/WebKit/gtk:

* WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
(DumpRenderTreeSupportGtk::clearMemoryCache):
* WebCoreSupport/DumpRenderTreeSupportGtk.h:
(DumpRenderTreeSupportGtk):

Tools:

* DumpRenderTree/gtk/DumpRenderTree.cpp:
(runTest):
* Scripts/webkitpy/layout_tests/port/gtk.py:
(GtkPort.setup_environ_for_server):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@128490 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/WebKit/gtk/ChangeLog
Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp
Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h
Tools/ChangeLog
Tools/DumpRenderTree/gtk/DumpRenderTree.cpp
Tools/Scripts/webkitpy/layout_tests/port/gtk.py

index 8fb9c66..30fb66c 100644 (file)
@@ -1,3 +1,17 @@
+2012-09-13  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r128453.
+        http://trac.webkit.org/changeset/128453
+        https://bugs.webkit.org/show_bug.cgi?id=96681
+
+        Having tests use the same appcache directory leads to timeouts
+        (Requested by zdobersek on #webkit).
+
+        * WebCoreSupport/DumpRenderTreeSupportGtk.cpp:
+        (DumpRenderTreeSupportGtk::clearMemoryCache):
+        * WebCoreSupport/DumpRenderTreeSupportGtk.h:
+        (DumpRenderTreeSupportGtk):
+
 2012-09-13  Zan Dobersek  <zandobersek@gmail.com>
 
         [GTK] Clear application cache between tests in DumpRenderTree
index e5d6989..39b9ddc 100644 (file)
@@ -26,7 +26,6 @@
 #include "AXObjectCache.h"
 #include "AccessibilityObject.h"
 #include "AnimationController.h"
-#include "ApplicationCacheStorage.h"
 #include "CSSComputedStyleDeclaration.h"
 #include "Chrome.h"
 #include "ChromeClientGtk.h"
@@ -812,9 +811,3 @@ void DumpRenderTreeSupportGtk::clearMemoryCache()
 {
     memoryCache()->evictResources();
 }
-
-void DumpRenderTreeSupportGtk::clearApplicationCache()
-{
-    cacheStorage().empty();
-    cacheStorage().vacuumDatabaseFile();
-}
index 375020d..7e6e1fa 100644 (file)
@@ -128,7 +128,6 @@ public:
     static void resetTrackedRepaints(WebKitWebFrame*);
 
     static void clearMemoryCache();
-    static void clearApplicationCache();
 
 private:
     static bool s_drtRun;
index 3954903..3c175f8 100644 (file)
@@ -1,3 +1,17 @@
+2012-09-13  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r128453.
+        http://trac.webkit.org/changeset/128453
+        https://bugs.webkit.org/show_bug.cgi?id=96681
+
+        Having tests use the same appcache directory leads to timeouts
+        (Requested by zdobersek on #webkit).
+
+        * DumpRenderTree/gtk/DumpRenderTree.cpp:
+        (runTest):
+        * Scripts/webkitpy/layout_tests/port/gtk.py:
+        (GtkPort.setup_environ_for_server):
+
 2012-09-13  James Robinson  <jamesr@chromium.org>
 
         [chromium] Temporarily remove Android Builder (dbg) from garden-o-matic view
index eecade9..dabb09d 100644 (file)
@@ -770,7 +770,6 @@ static void runTest(const string& inputLine)
 
     WebCoreTestSupport::resetInternalsObject(webkit_web_frame_get_global_context(mainFrame));
     DumpRenderTreeSupportGtk::clearMemoryCache();
-    DumpRenderTreeSupportGtk::clearApplicationCache();
 
     // A blank load seems to be necessary to reset state after certain tests.
     webkit_web_view_open(webView, "about:blank");
index f5ab9cc..b4a4a29 100644 (file)
@@ -71,8 +71,12 @@ class GtkPort(Port, PulseAudioSanitizer):
         environment['AUDIO_RESOURCES_PATH'] = self._filesystem.join(self._config.webkit_base_dir(),
                                                                     'Source', 'WebCore', 'platform',
                                                                     'audio', 'resources')
-        environment['XDG_CACHE_HOME'] = self._filesystem.join(self.results_directory(), 'appcache')
         self._copy_value_from_environ_if_set(environment, 'WEBKITOUTPUTDIR')
+        if self.get_option('webkit_test_runner'):
+            # FIXME: This is a workaround to ensure that testing with WebKitTestRunner is started with
+            # a non-existing cache. This should be removed when (and if) it will be possible to properly
+            # set the cache directory path through a WebKitWebContext.
+            environment['XDG_CACHE_HOME'] = self._filesystem.join(self.results_directory(), 'appcache')
         return environment
 
     def _generate_all_test_configurations(self):