Title: [149027] trunk/Tools
- Revision
- 149027
- Author
- [email protected]
- Date
- 2013-04-24 05:01:37 -0700 (Wed, 24 Apr 2013)
Log Message
[EFL][WK2] WebKitTestRunner failures due to IconDatabase assertions
https://bugs.webkit.org/show_bug.cgi?id=115095
Reviewed by Antonio Gomes.
Use different subfolders under DumpRenderTree Temp folder for every
functionality (icon database, cache, localstorage, ...). This makes
sure there is no conflict between the functionalities.
In EFL's case, libsoup cache was causing problems for the icon
database if sharing the same folder.
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::initialize):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (149026 => 149027)
--- trunk/Tools/ChangeLog 2013-04-24 11:21:54 UTC (rev 149026)
+++ trunk/Tools/ChangeLog 2013-04-24 12:01:37 UTC (rev 149027)
@@ -1 +1,18 @@
+2013-04-24 Christophe Dumez <[email protected]>
+
+ [EFL][WK2] WebKitTestRunner failures due to IconDatabase assertions
+ https://bugs.webkit.org/show_bug.cgi?id=115095
+
+ Reviewed by Antonio Gomes.
+
+ Use different subfolders under DumpRenderTree Temp folder for every
+ functionality (icon database, cache, localstorage, ...). This makes
+ sure there is no conflict between the functionalities.
+
+ In EFL's case, libsoup cache was causing problems for the icon
+ database if sharing the same folder.
+
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::initialize):
+
== Rolled over to ChangeLog-2013-04-24 ==
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (149026 => 149027)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2013-04-24 11:21:54 UTC (rev 149026)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2013-04-24 12:01:37 UTC (rev 149027)
@@ -341,11 +341,7 @@
m_geolocationProvider = adoptPtr(new GeolocationProviderMock(m_context.get()));
if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
- WKRetainPtr<WKStringRef> dumpRenderTreeTempWK(AdoptWK, WKStringCreateWithUTF8CString(dumpRenderTreeTemp));
- WKContextSetDatabaseDirectory(m_context.get(), dumpRenderTreeTempWK.get());
- WKContextSetLocalStorageDirectory(m_context.get(), dumpRenderTreeTempWK.get());
- WKContextSetDiskCacheDirectory(m_context.get(), dumpRenderTreeTempWK.get());
- WKContextSetCookieStorageDirectory(m_context.get(), dumpRenderTreeTempWK.get());
+ String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
// WebCore::pathByAppendingComponent is not used here because of the namespace,
// which leads us to this ugly #ifdef and file path concatenation.
@@ -354,8 +350,12 @@
#else
const char separator = '/';
#endif
- String iconDatabaseFileTemp = String::fromUTF8(dumpRenderTreeTemp) + separator + String(ASCIILiteral("WebpageIcons.db"));
- WKContextSetIconDatabasePath(m_context.get(), toWK(iconDatabaseFileTemp).get());
+
+ WKContextSetDatabaseDirectory(m_context.get(), toWK(temporaryFolder + separator + "Databases").get());
+ WKContextSetLocalStorageDirectory(m_context.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
+ WKContextSetDiskCacheDirectory(m_context.get(), toWK(temporaryFolder + separator + "Cache").get());
+ WKContextSetCookieStorageDirectory(m_context.get(), toWK(temporaryFolder + separator + "Cookies").get());
+ WKContextSetIconDatabasePath(m_context.get(), toWK(temporaryFolder + separator + "IconDatabase" + separator + "WebpageIcons.db").get());
}
platformInitializeContext();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
