MSYS: Skip src/test/recovery/t/017_shm.pl.

nmisch · nmisch · commit 2bc0474792e3 · 2019-04-14T00:36:47.000-07:00
Commit 947a350 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
diff --git 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
@@ -9,7 +9,14 @@
 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;
