Title: [204969] trunk/Tools
- Revision
- 204969
- Author
- [email protected]
- Date
- 2016-08-25 09:54:44 -0700 (Thu, 25 Aug 2016)
Log Message
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.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (204968 => 204969)
--- trunk/Tools/ChangeLog 2016-08-25 16:42:16 UTC (rev 204968)
+++ trunk/Tools/ChangeLog 2016-08-25 16:54:44 UTC (rev 204969)
@@ -1,3 +1,14 @@
+2016-08-25 Daniel Bates <[email protected]>
+
+ 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.
+
2016-08-25 Per Arne Vollan <[email protected]>
[Win] run-api-tests is failing.
Modified: trunk/Tools/Scripts/webkitperl/prepare-ChangeLog_unittest/generateFunctionLists.pl (204968 => 204969)
--- 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)
@@ -25,7 +25,6 @@
use strict;
use warnings;
-use File::Slurp;
use File::Temp;
use FindBin;
use Test::More;
@@ -355,6 +354,14 @@
open(STDERR, ">&", $savedStderr) or die "Cannot restore stderr: $!";
}
+sub writeFileWithContent($$)
+{
+ my ($file, $content) = @_;
+ open(FILE, ">", $file) or die "Cannot open $file: $!";
+ print FILE $content;
+ close(FILE);
+}
+
my $testCasesCount = @testCaseHashRefs;
plan(tests => $testCasesCount);
@@ -364,8 +371,8 @@
my $patchedFile = File::Spec->catfile($temporaryDirectory, "patched-$filename");
my $diffFile = File::Spec->catfile($temporaryDirectory, "a.diff");
foreach my $testCase (@testCaseHashRefs) {
- write_file($originalFile, $testCase->{inputText});
- write_file($diffFile, $testCase->{diffToApply});
+ writeFileWithContent($originalFile, $testCase->{inputText});
+ writeFileWithContent($diffFile, $testCase->{diffToApply});
my $exitCode = exitStatus(system("patch", "-s", "-d", $temporaryDirectory, "-i", $diffFile, "-o", $patchedFile));
die "Failed to apply patch for $testCase->{testName}: $exitCode" if $exitCode;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
