daemon: make SO_ACCEPTFILTER a shared variable

[public-inbox.git] / t / sigfd.t

diff --git a/t/sigfd.t b/t/sigfd.t
index 07120b64c68bae33955ab3105259bb493ec866b7..a1ab222c0c4daeaeb5ead02f8f2f35ad820782c9 100644 (file)
--- a/t/sigfd.t
+++ b/t/sigfd.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2021 all contributors <meta@public-inbox.org>
 use strict;
 use Test::More;
 use IO::Handle;
@@ -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;