<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[189390] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/189390">189390</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-09-04 14:53:00 -0700 (Fri, 04 Sep 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>It should be possible to pass relative HTTP test paths to DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=148825
&lt;rdar://problem/22583866&gt;

Reviewed by Tim Horton.

Convert the path to an absolute path if needed.

* DumpRenderTree/mac/DumpRenderTree.mm:
(computeTestURL):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreemacDumpRenderTreemm">trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189389 => 189390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog        2015-09-04 21:28:28 UTC (rev 189389)
+++ trunk/Tools/ChangeLog        2015-09-04 21:53:00 UTC (rev 189390)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2015-09-04  Anders Carlsson  &lt;andersca@apple.com&gt;
+
+        It should be possible to pass relative HTTP test paths to DumpRenderTree
+        https://bugs.webkit.org/show_bug.cgi?id=148825
+        &lt;rdar://problem/22583866&gt;
+
+        Reviewed by Tim Horton.
+
+        Convert the path to an absolute path if needed.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (computeTestURL):
+
</ins><span class="cx"> 2015-09-04  Jason Marcell  &lt;jmarcell@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Fix Swift unit tests for prepare-ChangeLog.
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (189389 => 189390)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2015-09-04 21:28:28 UTC (rev 189389)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm        2015-09-04 21:53:00 UTC (rev 189390)
</span><span class="lines">@@ -1903,20 +1903,22 @@
</span><span class="cx">     if ([pathOrURLString hasPrefix:@&quot;http://&quot;] || [pathOrURLString hasPrefix:@&quot;https://&quot;] || [pathOrURLString hasPrefix:@&quot;file://&quot;])
</span><span class="cx">         return [NSURL URLWithString:pathOrURLString];
</span><span class="cx"> 
</span><del>-    NSRange layoutTestsRange = [pathOrURLString rangeOfString:@&quot;/LayoutTests/&quot;];
</del><ins>+    NSString *absolutePath = [[[NSURL fileURLWithPath:pathOrURLString] absoluteURL] path];
+
+    NSRange layoutTestsRange = [absolutePath rangeOfString:@&quot;/LayoutTests/&quot;];
</ins><span class="cx">     if (layoutTestsRange.location == NSNotFound)
</span><del>-        return [NSURL fileURLWithPath:pathOrURLString];
</del><ins>+        return [NSURL fileURLWithPath:absolutePath];
</ins><span class="cx"> 
</span><del>-    *relativeTestPath = [pathOrURLString substringFromIndex:NSMaxRange(layoutTestsRange)];
</del><ins>+    *relativeTestPath = [absolutePath substringFromIndex:NSMaxRange(layoutTestsRange)];
</ins><span class="cx"> 
</span><span class="cx">     // Convert file URLs in LayoutTests/http/tests to HTTP URLs, except for file URLs in LayoutTests/http/tests/local.
</span><span class="cx"> 
</span><del>-    NSRange httpTestsRange = [pathOrURLString rangeOfString:@&quot;/LayoutTests/http/tests/&quot;];
-    if (httpTestsRange.location == NSNotFound || [pathOrURLString rangeOfString:@&quot;/LayoutTests/http/tests/local/&quot;].location != NSNotFound)
-        return [NSURL fileURLWithPath:pathOrURLString];
</del><ins>+    NSRange httpTestsRange = [absolutePath rangeOfString:@&quot;/LayoutTests/http/tests/&quot;];
+    if (httpTestsRange.location == NSNotFound || [absolutePath rangeOfString:@&quot;/LayoutTests/http/tests/local/&quot;].location != NSNotFound)
+        return [NSURL fileURLWithPath:absolutePath];
</ins><span class="cx"> 
</span><span class="cx">     auto components = adoptNS([[NSURLComponents alloc] init]);
</span><del>-    [components setPath:[pathOrURLString substringFromIndex:NSMaxRange(httpTestsRange) - 1]];
</del><ins>+    [components setPath:[absolutePath substringFromIndex:NSMaxRange(httpTestsRange) - 1]];
</ins><span class="cx">     [components setHost:@&quot;127.0.0.1&quot;];
</span><span class="cx"> 
</span><span class="cx">     // Paths under /ssl/ should be loaded using HTTPS.
</span></span></pre>
</div>
</div>

</body>
</html>