Attachment 360835 Details for Bug 194142 – Patch

[patch] Patch

bug-194142-20190201154033.patch (text/plain), 5.73 KB, created by Fujii Hironori on 2019-01-31 22:40:34 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2019-01-31 22:40:34 PST

Size: 5.73 KB

patch

obsolete

>Subversion Revision: 240835
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index b2de9a706afc18d395ab9d5cf59b5c6c9587fd97..fbf13666b488f5213523b8bf3fc5848b0d0933d7 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-01-31  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win] WebKitTestRunners is failing to create the IndexedDB directory.
>+        https://bugs.webkit.org/show_bug.cgi?id=194142
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        There three 'separator' variables in TestController.cpp. Renamed
>+        it 'pathSeparator', and unified them.
>+
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::TestController::generateContextConfiguration const):
>+        (WTR::createTestURL):
>+        (WTR::TestController::platformAdjustContext):
>+
> 2019-01-31  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Update flakiness dashboard configuration after recent queue changes
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 6c7e97adc3d7df1f48a71304c83092dc89edcd52..533c837594920b94be41d06a75c44552da42aca4 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -95,6 +95,12 @@
> 
> namespace WTR {
> 
>+#if OS(WINDOWS)
>+static constexpr auto pathSeparator = '\\';
>+#else
>+static constexpr auto pathSeparator = '/';
>+#endif
>+
> const unsigned TestController::viewWidth = 800;
> const unsigned TestController::viewHeight = 600;
> 
>@@ -451,15 +457,13 @@ WKRetainPtr<WKContextConfigurationRef> TestController::generateContextConfigurat
>     if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
>         String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
> 
>-        const char separator = '/';
>-
>-        WKContextConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(temporaryFolder + separator + "ApplicationCache").get());
>-        WKContextConfigurationSetDiskCacheDirectory(configuration.get(), toWK(temporaryFolder + separator + "Cache").get());
>-        WKContextConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "IndexedDB").get());
>-        WKContextConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "LocalStorage").get());
>-        WKContextConfigurationSetWebSQLDatabaseDirectory(configuration.get(), toWK(temporaryFolder + separator + "Databases" + separator + "WebSQL").get());
>-        WKContextConfigurationSetMediaKeysStorageDirectory(configuration.get(), toWK(temporaryFolder + separator + "MediaKeys").get());
>-        WKContextConfigurationSetResourceLoadStatisticsDirectory(configuration.get(), toWK(temporaryFolder + separator + "ResourceLoadStatistics").get());
>+        WKContextConfigurationSetApplicationCacheDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "ApplicationCache").get());
>+        WKContextConfigurationSetDiskCacheDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Cache").get());
>+        WKContextConfigurationSetIndexedDBDatabaseDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Databases" + pathSeparator + "IndexedDB").get());
>+        WKContextConfigurationSetLocalStorageDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "LocalStorage").get());
>+        WKContextConfigurationSetWebSQLDatabaseDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "Databases" + pathSeparator + "WebSQL").get());
>+        WKContextConfigurationSetMediaKeysStorageDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "MediaKeys").get());
>+        WKContextConfigurationSetResourceLoadStatisticsDirectory(configuration.get(), toWK(temporaryFolder + pathSeparator + "ResourceLoadStatistics").get());
>     }
>     return configuration;
> }
>@@ -1114,13 +1118,11 @@ static WKURLRef createTestURL(const char* pathOrURL)
>         return 0;
> 
> #if PLATFORM(WIN)
>-    const char separator = '\\';
>     bool isAbsolutePath = false;
>-    if (strlen(pathOrURL) >= 3 && pathOrURL[1] == ':' && pathOrURL[2] == separator)
>+    if (strlen(pathOrURL) >= 3 && pathOrURL[1] == ':' && pathOrURL[2] == pathSeparator)
>         isAbsolutePath = true;
> #else
>-    const char separator = '/';
>-    bool isAbsolutePath = pathOrURL[0] == separator;
>+    bool isAbsolutePath = pathOrURL[0] == pathSeparator;
> #endif
>     const char* filePrefix = "file://";
>     static const size_t prefixLength = strlen(filePrefix);
>@@ -1131,12 +1133,12 @@ static WKURLRef createTestURL(const char* pathOrURL)
>         strcpy(buffer.get(), filePrefix);
>         strcpy(buffer.get() + prefixLength, pathOrURL);
>     } else {
>-        buffer = std::make_unique<char[]>(prefixLength + PATH_MAX + length + 2); // 1 for the separator
>+        buffer = std::make_unique<char[]>(prefixLength + PATH_MAX + length + 2); // 1 for the pathSeparator
>         strcpy(buffer.get(), filePrefix);
>         if (!getcwd(buffer.get() + prefixLength, PATH_MAX))
>             return 0;
>         size_t numCharacters = strlen(buffer.get());
>-        buffer[numCharacters] = separator;
>+        buffer[numCharacters] = pathSeparator;
>         strcpy(buffer.get() + numCharacters + 1, pathOrURL);
>     }
> 
>@@ -2683,9 +2685,8 @@ WKContextRef TestController::platformAdjustContext(WKContextRef context, WKConte
> 
>     if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
>         String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
>-        const char separator = '/';
> 
>-        WKWebsiteDataStoreSetServiceWorkerRegistrationDirectory(dataStore, toWK(temporaryFolder + separator + "ServiceWorkers").get());
>+        WKWebsiteDataStoreSetServiceWorkerRegistrationDirectory(dataStore, toWK(temporaryFolder + pathSeparator + "ServiceWorkers").get());
>     }
> 
>     return context;

Actions: View | Formatted Diff | Diff

Attachments on bug 194142: 360835