diff options
| author | Noah Misch <noah@leadboat.com> | 2019-04-14 00:36:47 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2019-04-14 00:36:58 -0700 |
| commit | 6b7906e1d9e757bfbbf80df9461a31bf8bc578dd (patch) | |
| tree | 42d8d0451903eed44c4dfc4b1e4c2b11d5b0fe5f | |
| parent | 55926b0a091793952f7a2bd130e0032d8309a287 (diff) | |
MSYS: Skip src/test/recovery/t/017_shm.pl.
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
| -rw-r--r-- | src/test/perl/PostgresNode.pm | 4 | ||||
| -rw-r--r-- | src/test/recovery/t/017_shm.pl | 9 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm index f8e38ab4895..fd2a67c8c9e 100644 --- a/src/test/perl/PostgresNode.pm +++ b/src/test/perl/PostgresNode.pm @@ -725,9 +725,7 @@ sub kill9 my $name = $self->name; return unless defined $self->{_pid}; 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 TestLib::system_or_bail('pg_ctl', 'kill', 'KILL', $self->{_pid}); + kill(9, $self->{_pid}) or BAIL_OUT("kill(9, $self->{_pid}) failed"); $self->{_pid} = undef; return; } diff --git a/src/test/recovery/t/017_shm.pl b/src/test/recovery/t/017_shm.pl index fd731c49a3e..30d87daad99 100644 --- a/src/test/recovery/t/017_shm.pl +++ b/src/test/recovery/t/017_shm.pl @@ -9,7 +9,14 @@ use Test::More; use TestLib; use Time::HiRes qw(usleep); -plan tests => 5; +if ($^O eq 'msys') +{ + plan skip_all => 'missing SIGKILL implementation'; +} +else +{ + plan tests => 5; +} my $tempdir = TestLib::tempdir; my $port; |