Changeset 94676 in webkit

Timestamp:

Sep 7, 2011 10:04:22 AM (13 years ago)

Author:

Csaba Osztrogonác

Message:

[Qt][DRT] Normalize ​file:///tmp/LayoutTests in LayoutTestController::pathToLocalResource()
​https://bugs.webkit.org/show_bug.cgi?id=67254

Patch by Jarred Nicholls <​jarred@sencha.com> on 2011-09-07
Reviewed by Csaba Osztrogonác.

Translate ​file:///tmp/LayoutTests/* urls into the repository LayoutTests directory, which is
derived from the running location of DumpRenderTree binary.

• DumpRenderTree/qt/LayoutTestControllerQt.cpp:

(LayoutTestController::pathToLocalResource):
(LayoutTestController::setUserStyleSheetLocation): pass the url through pathToLocalResource

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/qt/LayoutTestControllerQt.cpp (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-09-07  Jarred Nicholls  <jarred@sencha.com>
+
+        [Qt][DRT] Normalize file:///tmp/LayoutTests in LayoutTestController::pathToLocalResource()
+        https://bugs.webkit.org/show_bug.cgi?id=67254
+
+        Reviewed by Csaba Osztrogonác.
+
+        Translate file:///tmp/LayoutTests/* urls into the repository LayoutTests directory, which is
+        derived from the running location of DumpRenderTree binary.
+
+        * DumpRenderTree/qt/LayoutTestControllerQt.cpp:
+        (LayoutTestController::pathToLocalResource):
+        (LayoutTestController::setUserStyleSheetLocation): pass the url through pathToLocalResource
+
 2011-09-07  Csaba Osztrogonác  <ossy@webkit.org>
 

trunk/Tools/DumpRenderTree/qt/LayoutTestControllerQt.cpp

@@ -34 +34 @@
 #include "WorkQueue.h"
 #include "WorkQueueItemQt.h"
+#include <QCoreApplication>
 #include <QDir>
 #include <QLocale>
@@ -242 +243 @@
 QString LayoutTestController::pathToLocalResource(const QString& url)
 {
-    // Function introduced in r28690.
-    return QDir::toNativeSeparators(url);
+    QString localTmpUrl(QLatin1String("file:///tmp/LayoutTests"));
+
+    // Translate a request for /tmp/LayoutTests to the repository LayoutTests directory.
+    // Do not rely on a symlink to be created via the test runner, which will not work on Windows.
+    if (url.startsWith(localTmpUrl)) {
+        // DumpRenderTree lives in WebKit/WebKitBuild/<build_mode>/bin.
+        // Translate from WebKit/WebKitBuild/Release/bin => WebKit/LayoutTests.
+        QFileInfo layoutTestsRoot(QCoreApplication::applicationDirPath() + QLatin1String("/../../../LayoutTests/"));
+        if (layoutTestsRoot.exists())
+            return QLatin1String("file://") + layoutTestsRoot.absolutePath() + url.mid(localTmpUrl.length());
+    }
+
+    return url;
 }
 
@@ -688 +700 @@
 void LayoutTestController::setUserStyleSheetLocation(const QString& url)
 {
-    m_userStyleSheetLocation = QUrl::fromEncoded(url.toAscii(), QUrl::StrictMode);
+    QByteArray urlData = pathToLocalResource(url).toLatin1();
+    m_userStyleSheetLocation = QUrl::fromEncoded(urlData, QUrl::StrictMode);
 
     if (m_userStyleSheetEnabled)