about summary refs log tree commit homepage
diff options
context:
space:
mode:
authorEric Wong <e@80x24.org>2023-01-02 08:18:47 +0000
committerEric Wong <e@80x24.org>2023-01-02 09:02:49 +0000
commitc88a8c39c987c16e71ae69536ba40d7a30dabd7f (patch)
treec222347764b62ea415f05131910f2d934200aacc
parentc4b882036d272cc276cbf3a0d108244893c3c8af (diff)
downloadpublic-inbox-c88a8c39c987c16e71ae69536ba40d7a30dabd7f.tar.gz
When using the `TAIL' environment, the tail(1) process
inherits the non-FD_CLOEXEC pipe we introduced in commit
5f9baf725106 (t/httpd-unix: eliminate some busy waits, 2022-12-12).
We must ensure that pipe is gone before waiting on -httpd's
death by destroying the tail(1) process, first.
-rw-r--r--t/httpd-unix.t1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index c45ff163..414ca0c8 100644
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -136,6 +136,7 @@ SKIP: {
                 my $pid = $read_pid->($pid_file);
                 is(kill('TERM', $pid), 1, "signaled daemonized $w process");
                 vec(my $rvec = '', fileno($p0), 1) = 1;
+                delete $td->{-extra}; # drop tail(1) process
                 is(select($rvec, undef, undef, 1), 1, 'timeout for pipe HUP');
                 is(my $undef = <$p0>, undef, 'process closed pipe writer at exit');
                 ok(!-e $pid_file, "$w pid file unlinked at exit");