Changeset 69657 in webkit

Timestamp:

Oct 13, 2010 7:07:06 AM (14 years ago)

Author:

kbalazs@webkit.org

Message:

2010-10-13 Balazs Kelemen <​kbalazs@webkit.org>

Reviewed by Csaba Osztrogonác.

WTR should accept relative paths
​https://bugs.webkit.org/show_bug.cgi?id=47486

• WebKitTestRunner/StringFunctions.h:
• WebKitTestRunner/TestInvocation.cpp: (WTR::createWKURL): Moved from StringFunctions.h since it is used only here. Extend relative paths to absolute.

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/StringFunctions.h (modified) (1 diff)
• WebKitTestRunner/TestInvocation.cpp (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-10-13  Balazs Kelemen  <kbalazs@webkit.org>
+
+        Reviewed by Csaba Osztrogonác.
+
+        WTR should accept relative paths
+        https://bugs.webkit.org/show_bug.cgi?id=47486
+
+        * WebKitTestRunner/StringFunctions.h:
+        * WebKitTestRunner/TestInvocation.cpp:
+        (WTR::createWKURL): Moved from StringFunctions.h since it is
+        used only here. Extend relative paths to absolute.
+
 2010-10-12  Adam Roben  <aroben@apple.com>
 

trunk/WebKitTools/WebKitTestRunner/StringFunctions.h

@@ -93 +93 @@
 }
 
-// URL creation
-
-inline WKURLRef createWKURL(const char* pathOrURL)
-{
-    if (strstr(pathOrURL, "http://") || strstr(pathOrURL, "https") || strstr(pathOrURL, "file://"))
-        return WKURLCreateWithUTF8CString(pathOrURL);
-
-    const char* filePrefix = "file://";
-    static const size_t prefixLength = strlen(filePrefix);
-    size_t length = strlen(pathOrURL);
-    OwnArrayPtr<char> buffer = adoptArrayPtr(new char[length + prefixLength + 1]);
-    strcpy(buffer.get(), filePrefix);
-    strcat(buffer.get(), pathOrURL);
-    return WKURLCreateWithUTF8CString(buffer.get());
-}
-
 } // namespace WTR
 

trunk/WebKitTools/WebKitTestRunner/TestInvocation.cpp

@@ -29 +29 @@
 #include "StringFunctions.h"
 #include "TestController.h"
+#include <climits>
 #include <cstdio>
 #include <WebKit2/WKContextPrivate.h>
@@ -35 +36 @@
 #include <wtf/PassOwnArrayPtr.h>
 
+#if OS(WINDOWS)
+#include <direct.h> // For _getcwd.
+#define getcwd _getcwd // MSDN says getcwd is deprecated.
+#define PATH_MAX _MAX_PATH
+#endif
+
 using namespace WebKit;
 using namespace std;
 
 namespace WTR {
+
+static WKURLRef createWKURL(const char* pathOrURL)
+{
+    if (strstr(pathOrURL, "http://") || strstr(pathOrURL, "https://") || strstr(pathOrURL, "file://"))
+        return WKURLCreateWithUTF8CString(pathOrURL);
+
+    // Creating from filesytem path.
+    size_t length = strlen(pathOrURL);
+    if (!length)
+        return 0;
+
+    const char* filePrefix = "file://";
+    static const size_t prefixLength = strlen(filePrefix);
+#if OS(WINDOWS)
+    const char separator = '\\';
+    bool isAbsolutePath = length >= 3 && pathOrURL[1] == ':' && pathOrURL[2] == separator;
+#else
+    const char separator = '/';
+    bool isAbsolutePath = pathOrURL[0] == separator;
+#endif
+
+    OwnArrayPtr<char> buffer;
+    if (isAbsolutePath) {
+        buffer = adoptArrayPtr(new char[prefixLength + length + 1]);
+        strcpy(buffer.get(), filePrefix);
+        strcpy(buffer.get() + prefixLength, pathOrURL);
+    } else {
+        buffer = adoptArrayPtr(new char[prefixLength + PATH_MAX + length + 2]); // 1 for the separator
+        strcpy(buffer.get(), filePrefix);
+        if (!getcwd(buffer.get() + prefixLength, PATH_MAX))
+            return 0;
+        size_t numCharacters = strlen(buffer.get());
+        buffer[numCharacters] = separator;
+        strcpy(buffer.get() + numCharacters + 1, pathOrURL);
+    }
+
+    return WKURLCreateWithUTF8CString(buffer.get());
+}
 
 TestInvocation::TestInvocation(const char* pathOrURL)