diff options
| -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 fff8c992a37..52708205850 100644 --- a/src/test/perl/PostgresNode.pm +++ b/src/test/perl/PostgresNode.pm @@ -734,9 +734,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 3cbe938ddd1..633606b2be0 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; |