<!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>[210517] 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/210517">210517</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-01-09 11:34:48 -0800 (Mon, 09 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support webkit-test-runner key-value pairs in http tests in DumpRenderTree
https://bugs.webkit.org/show_bug.cgi?id=166837
Patch by Antoine Quint <graouts@apple.com> on 2017-01-09
Reviewed by Alex Christensen.
We now correctly handle the --absolutePath argument in DumpRenderTree and use
the provided value when trying to determine the path to the test file. Failing
that, we use the computed URL or the raw path provided to cover all cases.
This was tested in the context of https://bugs.webkit.org/show_bug.cgi?id=165668
by applying this patch and seeing the number test failures dramatically reduced
with WK1 due to the option to turn modern media controls off for older media controls
tests.
* DumpRenderTree/DumpRenderTree.h:
* DumpRenderTree/DumpRenderTreeCommon.cpp:
(parseInputLine):
* DumpRenderTree/TestOptions.h:
* DumpRenderTree/TestOptions.mm:
(TestOptions::TestOptions):
* DumpRenderTree/mac/DumpRenderTree.mm:
(runTest):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreeh">trunk/Tools/DumpRenderTree/DumpRenderTree.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeDumpRenderTreeCommoncpp">trunk/Tools/DumpRenderTree/DumpRenderTreeCommon.cpp</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestOptionsh">trunk/Tools/DumpRenderTree/TestOptions.h</a></li>
<li><a href="#trunkToolsDumpRenderTreeTestOptionsmm">trunk/Tools/DumpRenderTree/TestOptions.mm</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 (210516 => 210517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-09 19:09:23 UTC (rev 210516)
+++ trunk/Tools/ChangeLog 2017-01-09 19:34:48 UTC (rev 210517)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2017-01-09 Antoine Quint <graouts@apple.com>
+
+ Support webkit-test-runner key-value pairs in http tests in DumpRenderTree
+ https://bugs.webkit.org/show_bug.cgi?id=166837
+
+ Reviewed by Alex Christensen.
+
+ We now correctly handle the --absolutePath argument in DumpRenderTree and use
+ the provided value when trying to determine the path to the test file. Failing
+ that, we use the computed URL or the raw path provided to cover all cases.
+
+ This was tested in the context of https://bugs.webkit.org/show_bug.cgi?id=165668
+ by applying this patch and seeing the number test failures dramatically reduced
+ with WK1 due to the option to turn modern media controls off for older media controls
+ tests.
+
+ * DumpRenderTree/DumpRenderTree.h:
+ * DumpRenderTree/DumpRenderTreeCommon.cpp:
+ (parseInputLine):
+ * DumpRenderTree/TestOptions.h:
+ * DumpRenderTree/TestOptions.mm:
+ (TestOptions::TestOptions):
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (runTest):
+
</ins><span class="cx"> 2017-01-09 Milan Crha <mcrha@redhat.com>
</span><span class="cx">
</span><span class="cx"> prepare-ChangeLog: Correct help string for --style option
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreeh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTree.h (210516 => 210517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTree.h 2017-01-09 19:09:23 UTC (rev 210516)
+++ trunk/Tools/DumpRenderTree/DumpRenderTree.h 2017-01-09 19:34:48 UTC (rev 210517)
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx">
</span><span class="cx"> struct TestCommand {
</span><span class="cx"> std::string pathOrURL;
</span><ins>+ std::string absolutePath;
</ins><span class="cx"> bool shouldDumpPixels { false };
</span><span class="cx"> std::string expectedPixelHash;
</span><span class="cx"> int timeout { 30000 }; // in ms
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeDumpRenderTreeCommoncpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/DumpRenderTreeCommon.cpp (210516 => 210517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/DumpRenderTreeCommon.cpp 2017-01-09 19:09:23 UTC (rev 210516)
+++ trunk/Tools/DumpRenderTree/DumpRenderTreeCommon.cpp 2017-01-09 19:34:48 UTC (rev 210517)
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx"> } else if (arg == "--dump-jsconsolelog-in-stderr")
</span><span class="cx"> result.dumpJSConsoleLogInStdErr = true;
</span><span class="cx"> else if (arg == std::string("--absolutePath"))
</span><del>- tokenizer.next();
</del><ins>+ result.absolutePath = tokenizer.next();
</ins><span class="cx"> else
</span><span class="cx"> die(inputLine);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestOptions.h (210516 => 210517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestOptions.h 2017-01-09 19:09:23 UTC (rev 210516)
+++ trunk/Tools/DumpRenderTree/TestOptions.h 2017-01-09 19:34:48 UTC (rev 210517)
</span><span class="lines">@@ -24,6 +24,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> #pragma once
</span><ins>+#include "DumpRenderTree.h"
</ins><span class="cx">
</span><span class="cx"> @class NSURL;
</span><span class="cx">
</span><span class="lines">@@ -32,5 +33,5 @@
</span><span class="cx"> bool enableModernMediaControls { false };
</span><span class="cx"> bool enablePointerLock { false };
</span><span class="cx">
</span><del>- TestOptions(NSURL *testURL);
</del><ins>+ TestOptions(NSURL*, const TestCommand&);
</ins><span class="cx"> };
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreeTestOptionsmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/TestOptions.mm (210516 => 210517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/TestOptions.mm 2017-01-09 19:09:23 UTC (rev 210516)
+++ trunk/Tools/DumpRenderTree/TestOptions.mm 2017-01-09 19:34:48 UTC (rev 210517)
</span><span class="lines">@@ -41,13 +41,17 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-TestOptions::TestOptions(NSURL *testURL)
</del><ins>+TestOptions::TestOptions(NSURL *testURL, const TestCommand& command)
</ins><span class="cx"> {
</span><del>- if (![testURL isFileURL])
</del><ins>+ std::string path = command.absolutePath;
+ if (path.empty() && [testURL isFileURL])
+ path = [testURL fileSystemRepresentation];
+ else
+ path = command.pathOrURL;
+
+ if (path.empty())
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- std::string path = [testURL fileSystemRepresentation];
-
</del><span class="cx"> std::string options;
</span><span class="cx"> std::ifstream testFile(path.data());
</span><span class="cx"> if (!testFile.good())
</span></span></pre></div>
<a id="trunkToolsDumpRenderTreemacDumpRenderTreemm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (210516 => 210517)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-01-09 19:09:23 UTC (rev 210516)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2017-01-09 19:34:48 UTC (rev 210517)
</span><span class="lines">@@ -1990,7 +1990,7 @@
</span><span class="cx"> NSString *informationString = [@"CRASHING TEST: " stringByAppendingString:testPath];
</span><span class="cx"> WKSetCrashReportApplicationSpecificInformation((CFStringRef)informationString);
</span><span class="cx">
</span><del>- TestOptions options(url);
</del><ins>+ TestOptions options(url, command);
</ins><span class="cx"> resetWebViewToConsistentStateBeforeTesting(options);
</span><span class="cx">
</span><span class="cx"> const char* testURL([[url absoluteString] UTF8String]);
</span></span></pre>
</div>
</div>
</body>
</html>