Changeset 124595 in webkit

Timestamp:

Aug 3, 2012, 4:23:08 AM (13 years ago)

Author:

kbalazs@webkit.org

Message:

[EFL] (REGRESSION 124581) : EFL 64-bit Debug bot is red and build is exiting early after 20 test crashes
​https://bugs.webkit.org/show_bug.cgi?id=93084

Patch by Sudarsana Nagineni <​sudarsana.nagineni@linux.intel.com> on 2012-08-03
Reviewed by Csaba Osztrogonác.

Fix regression introduced in r124581.

• DumpRenderTree/efl/DumpRenderTree.cpp:

(getFinalTestURL): Convert the path into a full file URL.
(runTest):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• DumpRenderTree/efl/DumpRenderTree.cpp (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2012-08-03  Sudarsana Nagineni  <sudarsana.nagineni@linux.intel.com>
+
+        [EFL] (REGRESSION 124581) : EFL 64-bit Debug bot is red and build is exiting early after 20 test crashes
+        https://bugs.webkit.org/show_bug.cgi?id=93084
+
+        Reviewed by Csaba Osztrogonác.
+
+        Fix regression introduced in r124581.
+
+        * DumpRenderTree/efl/DumpRenderTree.cpp:
+        (getFinalTestURL): Convert the path into a full file URL.
+        (runTest):
+
 2012-08-03  Balazs Kelemen  <kbalazs@webkit.org>
 

trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp

@@ -242 +242 @@
 }
 
+static String getFinalTestURL(const String& testURL)
+{
+    if (!testURL.startsWith("http://") && !testURL.startsWith("https://")) {
+        char* cFilePath = ecore_file_realpath(testURL.utf8().data());
+        const String filePath = String::fromUTF8(cFilePath);
+        free(cFilePath);
+
+        if (ecore_file_exists(filePath.utf8().data()))
+            return String("file://") + filePath;
+    }
+
+    return testURL;
+}
+
 static void runTest(const char* inputLine)
 {
     TestCommand command = parseInputLine(inputLine);
-    const String testURL(command.pathOrURL.c_str());
-    ASSERT(!testURL.isEmpty());
+    const String testPathOrURL(command.pathOrURL.c_str());
+    ASSERT(!testPathOrURL.isEmpty());
     dumpPixelsForCurrentTest = command.shouldDumpPixels;
     const String expectedPixelHash(command.expectedPixelHash.c_str());
+
+    // Convert the path into a full file URL if it does not look
+    // like an HTTP/S URL (doesn't start with http:// or https://).
+    const String testURL = getFinalTestURL(testPathOrURL);
 
     browser->resetDefaultsToConsistentValues();