WebKit Bugzilla
Attachment 360712 Details for
Bug 194012
: Fix WebKitTestRunner's testPath with Windows full paths
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
bug-194012-20190131192443.patch (text/plain), 1.80 KB, created by
Fujii Hironori
on 2019-01-31 02:24:44 PST
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Fujii Hironori
Created:
2019-01-31 02:24:44 PST
Size:
1.80 KB
patch
obsolete
>Subversion Revision: 240774 >diff --git a/Tools/ChangeLog b/Tools/ChangeLog >index e10899f805020ca570ec2836dc1e2efd71bdb187..2b4cc8ddccac3bb7e9ef557d8b589509dfe597ae 100644 >--- a/Tools/ChangeLog >+++ b/Tools/ChangeLog >@@ -1,3 +1,17 @@ >+2019-01-31 Fujii Hironori <Hironori.Fujii@sony.com> >+ >+ Fix WebKitTestRunner's testPath with Windows full paths >+ https://bugs.webkit.org/show_bug.cgi?id=194012 >+ >+ Reviewed by Alex Christensen. >+ >+ updateTestOptionsFromTestHeader failed to open test files because >+ testPath returned wrong file paths. It returned a path "/C:/..." >+ if a URL "file:///C:/..." was given. >+ >+ * WebKitTestRunner/TestController.cpp: >+ (WTR::testPath): Removed the first '/' if the path starts with something like "/C:/". >+ > 2019-01-31 Carlos Garcia Campos <cgarcia@igalia.com> > > [WPE] Bump font related dependencies to match the GTK+ port >diff --git a/Tools/WebKitTestRunner/TestController.cpp b/Tools/WebKitTestRunner/TestController.cpp >index 92e160a615890d336924c560f433ab0ed255a944..6c7e97adc3d7df1f48a71304c83092dc89edcd52 100644 >--- a/Tools/WebKitTestRunner/TestController.cpp >+++ b/Tools/WebKitTestRunner/TestController.cpp >@@ -1093,6 +1093,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 something 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();
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Formatted Diff
|
Diff
Attachments on
bug 194012
:
360564
| 360712