Title: [128490] trunk
- Revision
- 128490
- Author
- [email protected]
- Date
- 2012-09-13 12:21:26 -0700 (Thu, 13 Sep 2012)
Log Message
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).
Patch by Sheriff Bot <[email protected]> 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/gtk/ChangeLog (128489 => 128490)
--- trunk/Source/WebKit/gtk/ChangeLog 2012-09-13 19:19:44 UTC (rev 128489)
+++ trunk/Source/WebKit/gtk/ChangeLog 2012-09-13 19:21:26 UTC (rev 128490)
@@ -1,3 +1,17 @@
+2012-09-13 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[GTK] Clear application cache between tests in DumpRenderTree
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp (128489 => 128490)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-09-13 19:19:44 UTC (rev 128489)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.cpp 2012-09-13 19:21:26 UTC (rev 128490)
@@ -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 @@
{
memoryCache()->evictResources();
}
-
-void DumpRenderTreeSupportGtk::clearApplicationCache()
-{
- cacheStorage().empty();
- cacheStorage().vacuumDatabaseFile();
-}
Modified: trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h (128489 => 128490)
--- trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-09-13 19:19:44 UTC (rev 128489)
+++ trunk/Source/WebKit/gtk/WebCoreSupport/DumpRenderTreeSupportGtk.h 2012-09-13 19:21:26 UTC (rev 128490)
@@ -128,7 +128,6 @@
static void resetTrackedRepaints(WebKitWebFrame*);
static void clearMemoryCache();
- static void clearApplicationCache();
private:
static bool s_drtRun;
Modified: trunk/Tools/ChangeLog (128489 => 128490)
--- trunk/Tools/ChangeLog 2012-09-13 19:19:44 UTC (rev 128489)
+++ trunk/Tools/ChangeLog 2012-09-13 19:21:26 UTC (rev 128490)
@@ -1,3 +1,17 @@
+2012-09-13 Sheriff Bot <[email protected]>
+
+ 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 <[email protected]>
[chromium] Temporarily remove Android Builder (dbg) from garden-o-matic view
Modified: trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp (128489 => 128490)
--- trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-09-13 19:19:44 UTC (rev 128489)
+++ trunk/Tools/DumpRenderTree/gtk/DumpRenderTree.cpp 2012-09-13 19:21:26 UTC (rev 128490)
@@ -770,7 +770,6 @@
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");
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py (128489 => 128490)
--- trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-09-13 19:19:44 UTC (rev 128489)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/port/gtk.py 2012-09-13 19:21:26 UTC (rev 128490)
@@ -71,8 +71,12 @@
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):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
