Attachment 360564 Details for Bug 194012 – Patch

[patch] Patch

bug-194012-20190130182912.patch (text/plain), 1.88 KB, created by Fujii Hironori on 2019-01-30 01:29:13 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Fujii Hironori

Created: 2019-01-30 01:29:13 PST

Size: 1.88 KB

patch

obsolete

>Subversion Revision: 240642
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index 8cf0c9c48fc06bf1f4810b34194be52944690f77..c7b2e279f7d3b97d28a7a91c6edb29759ac1dd28 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,18 @@
>+2019-01-30  Fujii Hironori  <Hironori.Fujii@sony.com>
>+
>+        [Win][WebKitTestRunner] Can't get test header options in webkit-test-runner magic comments
>+        https://bugs.webkit.org/show_bug.cgi?id=194012
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Some test cases were failing due to failing to get test options.
>+        updateTestOptionsFromTestHeader failed to open test files because
>+        testPath returned wrong file paths. It returned "/C:/..." if
>+        "file:///C:/..." was given.
>+
>+        * WebKitTestRunner/TestController.cpp:
>+        (WTR::testPath): Removed the first '/' if the path starts with like "/C:/".
>+
> 2019-01-28  Ross Kirsling  <ross.kirsling@sony.com>
> 
>         Remove unnecessary `using namespace WTF`s (or at least restrict their scope).
>diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp
>index 0cff71956db9c428bb517b4d6cd3accb941be4d8..9d1c260ab230e853e73cb49f8984a29029c2cae8 100644
>--- a/Tools/WebKitTestRunner/TestController.cpp
>+++ b/Tools/WebKitTestRunner/TestController.cpp
>@@ -1091,6 +1091,11 @@ static std::string testPath(WKURLRef url)
>         auto path = adoptWK(WKURLCopyPath(url));
>         auto buffer = std::vector<char>(WKStringGetMaximumUTF8CStringSize(path.get()));
>         auto length = WKStringGetUTF8CString(path.get(), buffer.data(), buffer.size());
>+#if OS(WINDOWS)
>+        // Remove the first '/' if it starts with like "/C:/".
>+        if (length >= 4 && buffer[0] == '/' && buffer[2] == ':' && buffer[3] == '/')
>+            return std::string(buffer.data() + 1, length - 1);
>+#endif
>         return std::string(buffer.data(), length);
>     }
>     return std::string();

Actions: View | Formatted Diff | Diff

Attachments on bug 194012: 360564 | 360712