<!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>[204969] 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/204969">204969</a></dd>
<dt>Author</dt> <dd>dbates@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-25 09:54:44 -0700 (Thu, 25 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix test failure on GTK Linux bots after <http://trac.webkit.org/changeset/204695>
(https://bugs.webkit.org/show_bug.cgi?id=148437)
Remove use of module File::Slurp as it is not part of the standard Perl 5 distribution
and is not installed on the GTK Linux bots.
* Scripts/webkitperl/prepare-ChangeLog_unittest/generateFunctionLists.pl:
(writeFileWithContent): Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitperlprepareChangeLog_unittestgenerateFunctionListspl">trunk/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/generateFunctionLists.pl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (204968 => 204969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-08-25 16:42:16 UTC (rev 204968)
+++ trunk/Tools/ChangeLog 2016-08-25 16:54:44 UTC (rev 204969)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2016-08-25 Daniel Bates <dabates@apple.com>
+
+ Fix test failure on GTK Linux bots after <http://trac.webkit.org/changeset/204695>
+ (https://bugs.webkit.org/show_bug.cgi?id=148437)
+
+ Remove use of module File::Slurp as it is not part of the standard Perl 5 distribution
+ and is not installed on the GTK Linux bots.
+
+ * Scripts/webkitperl/prepare-ChangeLog_unittest/generateFunctionLists.pl:
+ (writeFileWithContent): Added.
+
</ins><span class="cx"> 2016-08-25 Per Arne Vollan <pvollan@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] run-api-tests is failing.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitperlprepareChangeLog_unittestgenerateFunctionListspl"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/generateFunctionLists.pl (204968 => 204969)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/generateFunctionLists.pl 2016-08-25 16:42:16 UTC (rev 204968)
+++ trunk/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/generateFunctionLists.pl 2016-08-25 16:54:44 UTC (rev 204969)
</span><span class="lines">@@ -25,7 +25,6 @@
</span><span class="cx"> use strict;
</span><span class="cx"> use warnings;
</span><span class="cx">
</span><del>-use File::Slurp;
</del><span class="cx"> use File::Temp;
</span><span class="cx"> use FindBin;
</span><span class="cx"> use Test::More;
</span><span class="lines">@@ -355,6 +354,14 @@
</span><span class="cx"> open(STDERR, ">&", $savedStderr) or die "Cannot restore stderr: $!";
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+sub writeFileWithContent($$)
+{
+ my ($file, $content) = @_;
+ open(FILE, ">", $file) or die "Cannot open $file: $!";
+ print FILE $content;
+ close(FILE);
+}
+
</ins><span class="cx"> my $testCasesCount = @testCaseHashRefs;
</span><span class="cx"> plan(tests => $testCasesCount);
</span><span class="cx">
</span><span class="lines">@@ -364,8 +371,8 @@
</span><span class="cx"> my $patchedFile = File::Spec->catfile($temporaryDirectory, "patched-$filename");
</span><span class="cx"> my $diffFile = File::Spec->catfile($temporaryDirectory, "a.diff");
</span><span class="cx"> foreach my $testCase (@testCaseHashRefs) {
</span><del>- write_file($originalFile, $testCase->{inputText});
- write_file($diffFile, $testCase->{diffToApply});
</del><ins>+ writeFileWithContent($originalFile, $testCase->{inputText});
+ writeFileWithContent($diffFile, $testCase->{diffToApply});
</ins><span class="cx"> my $exitCode = exitStatus(system("patch", "-s", "-d", $temporaryDirectory, "-i", $diffFile, "-o", $patchedFile));
</span><span class="cx"> die "Failed to apply patch for $testCase->{testName}: $exitCode" if $exitCode;
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>