Title: [124595] trunk/Tools
Revision
124595
Author
[email protected]
Date
2012-08-03 04:23:08 -0700 (Fri, 03 Aug 2012)

Log 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 <[email protected]> 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):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (124594 => 124595)


--- trunk/Tools/ChangeLog	2012-08-03 11:17:47 UTC (rev 124594)
+++ trunk/Tools/ChangeLog	2012-08-03 11:23:08 UTC (rev 124595)
@@ -1,3 +1,16 @@
+2012-08-03  Sudarsana Nagineni  <[email protected]>
+
+        [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  <[email protected]>
 
         All ports should support per test switching of pixel testing

Modified: trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp (124594 => 124595)


--- trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp	2012-08-03 11:17:47 UTC (rev 124594)
+++ trunk/Tools/DumpRenderTree/efl/DumpRenderTree.cpp	2012-08-03 11:23:08 UTC (rev 124595)
@@ -241,14 +241,32 @@
     }
 }
 
+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();
     createLayoutTestController(testURL, expectedPixelHash);
 
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to