database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-12 16:21:30 +03:00
Code

MSYS: Skip src/test/recovery/t/017_shm.pl.

Browse Source 
Commit 947a35014fdc2ec74cbf06c7dbac6eea6fae90c6 relied on a feature
available in v11 and later, so back-patching it to v10 and v9.6 was
invalid.  In those branches, revert it and skip the test on msys.

Discussion: https://postgr.es/m/GrdLgAdUK9FdyZg8VIcTDKVOkys122ZINEb3CjjoySfGj2KyPiMKTh1zqtRp0TAD7FJ27G-OBB3eplxIB5GhcQH5o8zzGZfp0MuJaXJxVxk=@yesql.se
This commit is contained in:
Noah Misch 2019-04-14 00:36:47 -07:00
parent 55926b0a09
commit 6b7906e1d9
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/test/perl/PostgresNode.pm
View File

@ -725,9 +725,7 @@ sub kill9
my $name = $self->name; my $name = $self->name;
return unless defined $self->{_pid}; return unless defined $self->{_pid};
print "### Killing node \"$name\" using signal 9\n"; print "### Killing node \"$name\" using signal 9\n";
# kill(9, ...) fails under msys Perl 5.8.8, so fall back on pg_ctl. kill(9, $self->{_pid}) or BAIL_OUT("kill(9, $self->{_pid}) failed");
kill(9, $self->{_pid})
or TestLib::system_or_bail('pg_ctl', 'kill', 'KILL', $self->{_pid});
$self->{_pid} = undef; $self->{_pid} = undef;
return; return;
} }

7
src/test/recovery/t/017_shm.pl
View File

@ -9,7 +9,14 @@ use Test::More;
use TestLib; use TestLib;
use Time::HiRes qw(usleep); use Time::HiRes qw(usleep);
if ($^O eq 'msys')
{
plan skip_all => 'missing SIGKILL implementation';
}
else
{
plan tests => 5; plan tests => 5;
}
my $tempdir = TestLib::tempdir; my $tempdir = TestLib::tempdir;
my $port; my $port;