<!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>[189311] 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/189311">189311</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-09-03 16:30:08 -0700 (Thu, 03 Sep 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>DumpRenderTree should automatically compute HTTP URLs for HTTP tests
https://bugs.webkit.org/show_bug.cgi?id=148746
rdar://problem/22568073
Reviewed by Tim Horton.
* DumpRenderTree/mac/DumpRenderTree.mm:
(computeTestURL):
Compute the test URL from the passed in path or URL. Special-case paths that contain /LayoutTests/http/tests.
(runTest):
Call computeTestURL.
(testPathFromURL):
Get rid of this; computeTestURL does this for us now.
* Scripts/webkitpy/port/driver.py:
(Driver._command_from_driver_input):
Don't convert HTTP test paths to URLS before passing them to DumpRenderTree on Mac. That's handled by DRT itself now.</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>
<li><a href="#trunkToolsScriptswebkitpyportdriverpy">trunk/Tools/Scripts/webkitpy/port/driver.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (189310 => 189311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-09-03 23:23:44 UTC (rev 189310)
+++ trunk/Tools/ChangeLog 2015-09-03 23:30:08 UTC (rev 189311)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2015-09-03 Anders Carlsson <andersca@apple.com>
+
+ DumpRenderTree should automatically compute HTTP URLs for HTTP tests
+ https://bugs.webkit.org/show_bug.cgi?id=148746
+ rdar://problem/22568073
+
+ Reviewed by Tim Horton.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (computeTestURL):
+ Compute the test URL from the passed in path or URL. Special-case paths that contain /LayoutTests/http/tests.
+
+ (runTest):
+ Call computeTestURL.
+
+ (testPathFromURL):
+ Get rid of this; computeTestURL does this for us now.
+
+ * Scripts/webkitpy/port/driver.py:
+ (Driver._command_from_driver_input):
+ Don't convert HTTP test paths to URLS before passing them to DumpRenderTree on Mac. That's handled by DRT itself now.
+
</ins><span class="cx"> 2015-09-03 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Swipe tests fail on Mavericks
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (189310 => 189311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-09-03 23:23:44 UTC (rev 189310)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2015-09-03 23:30:08 UTC (rev 189311)
</span><span class="lines">@@ -1896,25 +1896,40 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-static NSString *testPathFromURL(NSURL* url)
</del><ins>+static NSURL *computeTestURL(NSString *pathOrURLString, NSString **relativeTestPath)
</ins><span class="cx"> {
</span><del>- if ([url isFileURL]) {
- NSString *filePath = [url path];
- NSRange layoutTestsRange = [filePath rangeOfString:@"/LayoutTests/"];
- if (layoutTestsRange.location == NSNotFound)
- return nil;
</del><ins>+ *relativeTestPath = nil;
</ins><span class="cx">
</span><del>- return [filePath substringFromIndex:NSMaxRange(layoutTestsRange)];
</del><ins>+ if ([pathOrURLString hasPrefix:@"http://"] || [pathOrURLString hasPrefix:@"https://"] || [pathOrURLString hasPrefix:@"file://"])
+ return [NSURL URLWithString:pathOrURLString];
+
+ NSRange layoutTestsRange = [pathOrURLString rangeOfString:@"/LayoutTests/"];
+ if (layoutTestsRange.location == NSNotFound)
+ return [NSURL fileURLWithPath:pathOrURLString];
+
+ *relativeTestPath = [pathOrURLString substringFromIndex:NSMaxRange(layoutTestsRange)];
+
+ // Convert file URLs in LayoutTests/http/tests to HTTP URLs, except for file URLs in LayoutTests/http/tests/local.
+
+ NSRange httpTestsRange = [pathOrURLString rangeOfString:@"/LayoutTests/http/tests/"];
+ if (httpTestsRange.location == NSNotFound || [pathOrURLString rangeOfString:@"/LayoutTests/http/tests/local/"].location != NSNotFound)
+ return [NSURL fileURLWithPath:pathOrURLString];
+
+ auto components = adoptNS([[NSURLComponents alloc] init]);
+ [components setPath:[pathOrURLString substringFromIndex:NSMaxRange(httpTestsRange) - 1]];
+ [components setHost:@"127.0.0.1"];
+
+ // Paths under /ssl/ should be loaded using HTTPS.
+ BOOL isSecure = [[components path] hasPrefix:@"/ssl/"];
+ if (isSecure) {
+ [components setScheme:@"https"];
+ [components setPort:@(8443)];
+ } else {
+ [components setScheme:@"http"];
+ [components setPort:@(8000)];
</ins><span class="cx"> }
</span><del>-
- // HTTP test URLs look like: http://127.0.0.1:8000/inspector/resource-tree/resource-request-content-after-loading-and-clearing-cache.html
- if (![[url scheme] isEqualToString:@"http"] && ![[url scheme] isEqualToString:@"https"])
- return nil;
</del><span class="cx">
</span><del>- if ([[url host] isEqualToString:@"127.0.0.1"] && ([[url port] intValue] == 8000 || [[url port] intValue] == 8443))
- return [url path];
-
- return nil;
</del><ins>+ return [components URL];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void runTest(const string& inputLine)
</span><span class="lines">@@ -1931,19 +1946,15 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- NSURL *url;
- if ([pathOrURLString hasPrefix:@"http://"] || [pathOrURLString hasPrefix:@"https://"] || [pathOrURLString hasPrefix:@"file://"])
- url = [NSURL URLWithString:pathOrURLString];
- else
- url = [NSURL fileURLWithPath:pathOrURLString];
</del><ins>+ NSString *testPath;
+ NSURL *url = computeTestURL(pathOrURLString, &testPath);
</ins><span class="cx"> if (!url) {
</span><span class="cx"> fprintf(stderr, "Failed to parse \"%s\" as a URL\n", pathOrURL.c_str());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><del>-
- NSString *testPath = testPathFromURL(url);
</del><span class="cx"> if (!testPath)
</span><span class="cx"> testPath = [url absoluteString];
</span><ins>+
</ins><span class="cx"> NSString *informationString = [@"CRASHING TEST: " stringByAppendingString:testPath];
</span><span class="cx"> WKSetCrashReportApplicationSpecificInformation((CFStringRef)informationString);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpyportdriverpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/port/driver.py (189310 => 189311)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/port/driver.py 2015-09-03 23:23:44 UTC (rev 189310)
+++ trunk/Tools/Scripts/webkitpy/port/driver.py 2015-09-03 23:30:08 UTC (rev 189311)
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> # FIXME: performance tests pass in full URLs instead of test names.
</span><span class="cx"> if driver_input.test_name.startswith('http://') or driver_input.test_name.startswith('https://') or driver_input.test_name == ('about:blank'):
</span><span class="cx"> command = driver_input.test_name
</span><del>- elif self.is_http_test(driver_input.test_name) or self.is_web_platform_test(driver_input.test_name):
</del><ins>+ elif self.is_web_platform_test(driver_input.test_name) or (self.is_http_test(driver_input.test_name) and (self._port.get_option('webkit_test_runner') or sys.platform == "cygwin")):
</ins><span class="cx"> command = self.test_to_uri(driver_input.test_name)
</span><span class="cx"> else:
</span><span class="cx"> command = self._port.abspath_for_test(driver_input.test_name)
</span></span></pre>
</div>
</div>
</body>
</html>