Avoid odd portability problem in TestLib.pm's slurp_file function.

tglsfdc · tglsfdc · commit 56a79a5ae9fe · 2015-12-08T16:58:05.000-05:00
For unclear reasons, this function doesn't always read the expected data
in some old Perl versions.  Rewriting it to avoid use of ARGV seems to
dodge the problem, and this version is clearer anyway if you ask me.

In passing, also improve error message in adjacent append_to_file function.
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
@@ -242,9 +242,12 @@ sub slurp_dir
 
 sub slurp_file
 {
+	my ($filename) = @_;
 	local $/;
-	local @ARGV = @_;
-	my $contents = <>;
+	open(my $in, '<', $filename)
+	  or die "could not read \"$filename\": $!";
+	my $contents = <$in>;
+	close $in;
 	$contents =~ s/\r//g if $Config{osname} eq 'msys';
 	return $contents;
 }

Original file line number	Diff line number	Diff line change
`@@ -242,9 +242,12 @@ sub slurp_dir`
`242`	`242`
`243`	`243`	`sub slurp_file`
`244`	`244`	`{`
	`245`	`+ my ($filename) = @_;`
`245`	`246`	`local $/;`
`246`		`- local @ARGV = @_;`
`247`		`- my $contents = <>;`
	`247`	`+ open(my $in, '<', $filename)`
	`248`	`+ or die "could not read \"$filename\": $!";`
	`249`	`+ my $contents = <$in>;`
	`250`	`+ close $in;`
`248`	`251`	`$contents =~ s/\r//g if $Config{osname} eq 'msys';`
`249`	`252`	`return $contents;`
`250`	`253`	`}`