Changeset 200506 in webkit

Timestamp:

May 5, 2016, 11:07:25 PM (10 years ago)

Author:

ap@apple.com

Message:

Partially revert ​http://trac.webkit.org/r200504
Improve HTTP test names in WebKitTestRunner's crash report information
​https://bugs.webkit.org/show_bug.cgi?id=157389

• WebKitTestRunner/cocoa/CrashReporterInfo.mm: Turns out that we can't have URLs

in crash reporter information.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• WebKitTestRunner/cocoa/CrashReporterInfo.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2016-05-05  Alexey Proskuryakov  <ap@apple.com>
+
+        Partially revert http://trac.webkit.org/r200504
+        Improve HTTP test names in WebKitTestRunner's crash report information
+        https://bugs.webkit.org/show_bug.cgi?id=157389
+
+        * WebKitTestRunner/cocoa/CrashReporterInfo.mm: Turns out that we can't have URLs
+        in crash reporter information.
+
 2016-05-05  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Tools/WebKitTestRunner/cocoa/CrashReporterInfo.mm

@@ -34 +34 @@
 namespace WTR {
 
-static String testDescription(WKURLRef url)
+static String testPathFromURL(WKURLRef url)
 {
     RetainPtr<CFURLRef> cfURL = adoptCF(WKURLCopyCFURL(kCFAllocatorDefault, url));
@@ -60 +60 @@
     RetainPtr<CFStringRef> hostCFString = adoptCF(CFURLCopyHostName(cfURL.get()));
     String hostString(hostCFString.get());
-    if (hostString != "127.0.0.1")
-        return String();
+    if (hostString == "127.0.0.1")
+        return pathString;
 
-    return CFURLGetString(cfURL.get());
+    return String();
 }
 
 void setCrashReportApplicationSpecificInformationToURL(WKURLRef url)
 {
-    String description = testDescription(url);
-    if (!description.isNull()) {
+    String testPath = testPathFromURL(url);
+    if (!testPath.isNull()) {
         String message("CRASHING TEST: ");
-        message = message + description;
+        message = message + testPath;
         WKSetCrashReportApplicationSpecificInformation(message.createCFString().get());
     }