treewide: run update-copyrights from gnulib for 2019

[public-inbox.git] / t / ds-leak.t

diff --git a/t/ds-leak.t b/t/ds-leak.t
index 9e3243e92c6118a3d998560d832af4271c3634ed..ea0eeaa651b06eb4e0636f4ba8d74cd440d73c57 100644 (file)
--- a/t/ds-leak.t
+++ b/t/ds-leak.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# Copyright (C) 2019-2020 all contributors <meta@public-inbox.org>
 # Licensed the same as Danga::Socket (and Perl5)
 # License: GPL-1.0+ or Artistic-1.0-Perl
 #  <https://www.gnu.org/licenses/gpl-1.0.txt>
@@ -8,16 +8,28 @@ use warnings;
 use Test::More;
 use_ok 'PublicInbox::DS';
 
-subtest('close-on-exec for epoll and kqueue' => sub {
+if ('close-on-exec for epoll and kqueue') {
        use PublicInbox::Spawn qw(spawn);
        my $pid;
        my $evfd_re = qr/(?:kqueue|eventpoll)/i;
 
        PublicInbox::DS->SetLoopTimeout(0);
        PublicInbox::DS->SetPostLoopCallback(sub { 0 });
-       PublicInbox::DS->AddTimer(0, sub { $pid = spawn([qw(sleep 10)]) });
+
+       # make sure execve closes if we're using fork()
+       my ($r, $w);
+       pipe($r, $w) or die "pipe: $!";
+
+       PublicInbox::DS::add_timer(0, sub { $pid = spawn([qw(sleep 10)]) });
        PublicInbox::DS->EventLoop;
        ok($pid, 'subprocess spawned');
+
+       # wait for execve, we need to ensure lsof sees sleep(1)
+       # and not the fork of this process:
+       close $w or die "close: $!";
+       my $l = <$r>;
+       is($l, undef, 'cloexec works and sleep(1) is running');
+
        my @of = grep(/$evfd_re/, `lsof -p $pid 2>/dev/null`);
        my $err = $?;
        SKIP: {
@@ -29,7 +41,7 @@ subtest('close-on-exec for epoll and kqueue' => sub {
                waitpid($pid, 0);
        }
        PublicInbox::DS->Reset;
-});
+}
 
 SKIP: {
        # not bothering with BSD::Resource