diff options
| author | Noah Misch <noah@leadboat.com> | 2019-04-13 11:09:27 -0700 |
|---|---|---|
| committer | Noah Misch <noah@leadboat.com> | 2019-04-13 11:09:27 -0700 |
| commit | 947a35014fdc2ec74cbf06c7dbac6eea6fae90c6 (patch) | |
| tree | fa0d2676fcf12a73a4126b2e37b348f8b2490c16 /src/test/perl/PostgresNode.pm | |
| parent | 5f1433ac5e7f943b29ef01266b6b8fc915e6b917 (diff) | |
| download | postgresql-947a35014fdc2ec74cbf06c7dbac6eea6fae90c6.tar.gz postgresql-947a35014fdc2ec74cbf06c7dbac6eea6fae90c6.zip | |
When Perl "kill(9, ...)" fails, try "pg_ctl kill".
Per buildfarm member jacana, the former fails under msys Perl 5.8.8.
Back-patch to 9.6, like the code in question.
Discussion: https://postgr.es/m/GrdLgAdUK9FdyZg8VIcTDKVOkys122ZINEb3CjjoySfGj2KyPiMKTh1zqtRp0TAD7FJ27G-OBB3eplxIB5GhcQH5o8zzGZfp0MuJaXJxVxk=@yesql.se
Diffstat (limited to 'src/test/perl/PostgresNode.pm')
| -rw-r--r-- | src/test/perl/PostgresNode.pm | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm index f6570639e00..61d78ad4c0d 100644 --- a/src/test/perl/PostgresNode.pm +++ b/src/test/perl/PostgresNode.pm @@ -789,7 +789,9 @@ sub kill9 my $name = $self->name; return unless defined $self->{_pid}; print "### Killing node \"$name\" using signal 9\n"; - kill(9, $self->{_pid}) or BAIL_OUT("kill(9, $self->{_pid}) failed"); + # 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}); $self->{_pid} = undef; return; } |