summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoah Misch2019-04-13 18:09:27 +0000
committerNoah Misch2019-04-13 18:09:27 +0000
commit947a35014fdc2ec74cbf06c7dbac6eea6fae90c6 (patch)
treefa0d2676fcf12a73a4126b2e37b348f8b2490c16
parent5f1433ac5e7f943b29ef01266b6b8fc915e6b917 (diff)
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
-rw-r--r--src/test/perl/PostgresNode.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm
index f6570639e0..61d78ad4c0 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;
}