From: Eric Wong <e@80x24.org>
To: spew@80x24.org
Subject: [PATCH 10/10] special cases for unblocking signals
Date: Sat, 2 Sep 2023 11:10:00 +0000 [thread overview]
Message-ID: <20230902111000.1747604-10-e@80x24.org> (raw)
In-Reply-To: <20230902111000.1747604-1-e@80x24.org>
---
lib/PublicInbox/TestCommon.pm | 5 +++--
t/lei-sigpipe.t | 3 ++-
t/v2mirror.t | 1 +
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/PublicInbox/TestCommon.pm b/lib/PublicInbox/TestCommon.pm
index b07c7957..1fd01bcb 100644
--- a/lib/PublicInbox/TestCommon.pm
+++ b/lib/PublicInbox/TestCommon.pm
@@ -475,7 +475,8 @@ sub start_script {
}
my $oset = PublicInbox::DS::block_signals();
require PublicInbox::OnDestroy;
- my $restore = PublicInbox::OnDestroy->new($$,
+ my $restore = PublicInbox::OnDestroy->new(
+ $opt->{unblock_child} ? () : ($$),
\&PublicInbox::DS::sig_setmask, $oset);
my $pid = fork // die "fork: $!";
if ($pid == 0) {
@@ -503,8 +504,8 @@ sub start_script {
}
if ($opt->{-C}) { chdir($opt->{-C}) or die "chdir: $!" }
$0 = join(' ', @$cmd);
+ undef $restore;
if ($sub) {
- eval { PublicInbox::DS->Reset };
_run_sub($sub, $key, \@argv);
POSIX::_exit($? >> 8);
} else {
diff --git a/t/lei-sigpipe.t b/t/lei-sigpipe.t
index 55c208e2..fe986c68 100644
--- a/t/lei-sigpipe.t
+++ b/t/lei-sigpipe.t
@@ -39,7 +39,8 @@ EOM
lei_ok(qw(import), $f) if $imported++ == 0;
open my $errfh, '+>>', "$ENV{HOME}/stderr.log" or xbail $!;
- my $opt = { run_mode => 0, 2 => $errfh, 1 => $w };
+ my $opt = { run_mode => 0, 2 => $errfh, 1 => $w,
+ unblock_child => 1 };
my $cmd = [qw(lei q -q -t), @$out, 'z:1..'];
my $tp = start_script($cmd, undef, $opt);
close $w;
diff --git a/t/v2mirror.t b/t/v2mirror.t
index c1c66d45..2bc2b194 100644
--- a/t/v2mirror.t
+++ b/t/v2mirror.t
@@ -364,6 +364,7 @@ EOM
open $rdr->{2}, '>>', "$tmpdir/plackup.err.log" or xbail "open: $!";
open $rdr->{1}, '>>&', $rdr->{2} or xbail "open: $!";
my $env = { PERL5LIB => 'lib', PERL_INLINE_DIRECTORY => undef };
+ $rdr->{unblock_child} = 1;
$td = start_script($cmd, $env, $rdr);
# wait for plackup socket()+bind()+listen()
my %opt = ( Proto => 'tcp', Type => Socket::SOCK_STREAM(),
prev parent reply other threads:[~2023-09-02 11:10 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-09-02 11:09 [PATCH 01/10] ds: don't block important signals we don't use Eric Wong
2023-09-02 11:09 ` [PATCH 02/10] t/sigfd: test EVFILT_SIGNAL vs signalfd differences Eric Wong
2023-09-02 11:09 ` [PATCH 03/10] t/sigfd: better checks related to SIGWINCH Eric Wong
2023-09-02 11:09 ` [PATCH 04/10] update devel/syscall-list to devel/sysdefs-list Eric Wong
2023-09-02 11:09 ` [PATCH 05/10] daemon: workaround pre-EVFILT_SIGNAL signals Eric Wong
2023-09-02 11:09 ` [PATCH 06/10] watch: ensure children can use signal handlers Eric Wong
2023-09-02 11:09 ` [PATCH 07/10] test_common: start_script: block signals around fork Eric Wong
2023-09-02 11:09 ` [PATCH 08/10] xap_helper: support SIGTTIN+SIGTTOU worker adjustments Eric Wong
2023-09-02 11:09 ` [PATCH 09/10] ds: merge sigmask Eric Wong
2023-09-02 11:10 ` Eric Wong [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230902111000.1747604-10-e@80x24.org \
--to=e@80x24.org \
--cc=spew@80x24.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).