diff options
author | Andrew Dunstan <andrew@dunslane.net> | 2020-12-15 10:00:18 -0500 |
---|---|---|
committer | Andrew Dunstan <andrew@dunslane.net> | 2020-12-15 10:26:03 -0500 |
commit | 355f9d2452dc93563fd89cac4b858d9e3f8e5960 (patch) | |
tree | 54ceff5c06b3d10ff4954bf5ce8122a5f20d2316 | |
parent | 4ee058a3bd9b939d940b8621f66a5c09163cc295 (diff) | |
download | postgresql-355f9d2452dc93563fd89cac4b858d9e3f8e5960.tar.gz postgresql-355f9d2452dc93563fd89cac4b858d9e3f8e5960.zip |
Use native methods to open input in TestLib::slurp_file on Windows.
This is a backport of commits 114541d58e and 6f59826f0 to the remaining
live branches.
-rw-r--r-- | src/test/perl/TestLib.pm | 27 |
1 files changed, 23 insertions, 4 deletions
diff --git a/src/test/perl/TestLib.pm b/src/test/perl/TestLib.pm index 34841ff9654..4144755bce3 100644 --- a/src/test/perl/TestLib.pm +++ b/src/test/perl/TestLib.pm @@ -77,6 +77,11 @@ BEGIN # Must be set early $windows_os = $Config{osname} eq 'MSWin32' || $Config{osname} eq 'msys'; + if ($windows_os) + { + require Win32API::File; + Win32API::File->import(qw(createFile OsFHandleOpen CloseHandle)); + } } INIT @@ -250,10 +255,24 @@ sub slurp_file { my ($filename) = @_; local $/; - open(my $in, '<', $filename) - or die "could not read \"$filename\": $!"; - my $contents = <$in>; - close $in; + my $contents; + if ($Config{osname} ne 'MSWin32') + { + open(my $in, '<', $filename) + or die "could not read \"$filename\": $!"; + $contents = <$in>; + close $in; + } + else + { + my $fHandle = createFile($filename, "r", "rwd") + or die "could not open \"$filename\": $^E"; + OsFHandleOpen(my $fh = IO::Handle->new(), $fHandle, 'r') + or die "could not read \"$filename\": $^E\n"; + $contents = <$fh>; + CloseHandle($fHandle) + or die "could not close \"$filename\": $^E\n"; + } $contents =~ s/\r\n/\n/g if $Config{osname} eq 'msys'; return $contents; } |