X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fsigfd.t;h=a1ab222c0c4daeaeb5ead02f8f2f35ad820782c9;hb=67fe4d8d90ac77419c8fc41457c849aa7d366a9d;hp=3a383d798bd120019fbb0823e187c8eee6095547;hpb=af0b0fb7a454470a32c452119d0392e0dedb3fe1;p=public-inbox.git

diff --git a/t/sigfd.t b/t/sigfd.t
index 3a383d79..a1ab222c 100644
--- a/t/sigfd.t
+++ b/t/sigfd.t
@@ -6,15 +6,14 @@ use POSIX qw(:signal_h);
 use Errno qw(ENOSYS);
 use PublicInbox::Syscall qw(SFD_NONBLOCK);
 require_ok 'PublicInbox::Sigfd';
+use PublicInbox::DS;
 
 SKIP: {
 	if ($^O ne 'linux' && !eval { require IO::KQueue }) {
 		skip 'signalfd requires Linux or IO::KQueue to emulate', 10;
 	}
-	my $new = POSIX::SigSet->new;
-	$new->fillset or die "sigfillset: $!";
-	my $old = POSIX::SigSet->new;
-	sigprocmask(SIG_SETMASK, $new, $old) or die "sigprocmask $!";
+
+	my $old = PublicInbox::DS::block_signals();
 	my $hit = {};
 	my $sig = {};
 	local $SIG{HUP} = sub { $hit->{HUP}->{normal}++ };
@@ -25,7 +24,6 @@ SKIP: {
 	}
 	my $sigfd = PublicInbox::Sigfd->new($sig, 0);
 	if ($sigfd) {
-		require PublicInbox::DS;
 		ok($sigfd, 'Sigfd->new works');
 		kill('HUP', $$) or die "kill $!";
 		kill('INT', $$) or die "kill $!";
@@ -49,7 +47,8 @@ SKIP: {
 		kill('HUP', $$) or die "kill $!";
 		PublicInbox::DS->SetPostLoopCallback(sub {}); # loop once
 		PublicInbox::DS->EventLoop;
-		is($hit->{HUP}->{sigfd}, 2, 'HUP sigfd fired in event loop');
+		is($hit->{HUP}->{sigfd}, 2, 'HUP sigfd fired in event loop') or
+			diag explain($hit); # sometimes fails on FreeBSD 11.x
 		kill('TERM', $$) or die "kill $!";
 		kill('HUP', $$) or die "kill $!";
 		PublicInbox::DS->EventLoop;