From 2bc0474792e346c6c7f16cdc33607568e9e92c74 Mon Sep 17 00:00:00 2001 From: Noah Misch Date: Sun, 14 Apr 2019 00:36:47 -0700 Subject: 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 --- src/test/perl/PostgresNode.pm | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/test/perl/PostgresNode.pm') 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; } -- cgit v1.2.3