Don't use native methods in TestLib::slurp_file on Msys

adunstan · adunstan · commit f6f59826f011 · 2019-11-27T15:45:44.000-05:00
Commit 114541d has upset some buildfarm members running Msys, that weren't previously having problems, so the use of native Windows methods to open files is restricted by this patch to only MSVC builds.
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm
@@ -400,7 +400,7 @@ sub slurp_file
 	my ($filename) = @_;
 	local $/;
 	my $contents;
-	if (!$windows_os)
+	if ($Config{osname} ne 'MSWin32')
 	{
 		open(my $in, '<', $filename)
 		  or die "could not read \"$filename\": $!";

Original file line number	Diff line number	Diff line change
`@@ -400,7 +400,7 @@ sub slurp_file`
`400`	`400`	`my ($filename) = @_;`
`401`	`401`	`local $/;`
`402`	`402`	`my $contents;`
`403`		`- if (!$windows_os)`
	`403`	`+ if ($Config{osname} ne 'MSWin32')`
`404`	`404`	`{`
`405`	`405`	`open(my $in, '<', $filename)`
`406`	`406`	`or die "could not read \"$filename\": $!";`