X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fds-leak.t;h=72bf037937e544940bacd102326ebfde4eba6c67;hb=e39585ee2bdcbeaab7b6bd33b3568021042d0879;hp=9e3243e92c6118a3d998560d832af4271c3634ed;hpb=b77c87a6fce05c4f2048aa0a73fde7b25a2b0002;p=public-inbox.git

diff --git a/t/ds-leak.t b/t/ds-leak.t
index 9e3243e9..72bf0379 100644
--- 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>
@@ -6,22 +6,37 @@
 use strict;
 use warnings;
 use Test::More;
+use PublicInbox::TestCommon;
 use_ok 'PublicInbox::DS';
 
-subtest('close-on-exec for epoll and kqueue' => sub {
-	use PublicInbox::Spawn qw(spawn);
+if ('close-on-exec for epoll and kqueue') {
+	use PublicInbox::Spawn qw(spawn which);
 	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');
-	my @of = grep(/$evfd_re/, `lsof -p $pid 2>/dev/null`);
-	my $err = $?;
+
+	# 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');
+
 	SKIP: {
-		skip "lsof missing? (\$?=$err)", 1 if $err;
+		my $lsof = which('lsof') or skip 'lsof missing', 1;
+		my $rdr = { 2 => \(my $null) };
+		my @of = grep(/$evfd_re/, xqx([$lsof, '-p', $pid], {}, $rdr));
+		my $err = $?;
+		skip "lsof broken ? (\$?=$err)", 1 if $err;
 		is_deeply(\@of, [], 'no FDs leaked to subprocess');
 	};
 	if (defined $pid) {
@@ -29,11 +44,12 @@ subtest('close-on-exec for epoll and kqueue' => sub {
 		waitpid($pid, 0);
 	}
 	PublicInbox::DS->Reset;
-});
+}
 
 SKIP: {
-	# not bothering with BSD::Resource
-	chomp(my $n = `/bin/sh -c 'ulimit -n'`);
+	require_mods('BSD::Resource', 1);
+	my $rlim = BSD::Resource::RLIMIT_NOFILE();
+	my ($n,undef) = BSD::Resource::getrlimit($rlim);
 
 	# FreeBSD 11.2 with 2GB RAM gives RLIMIT_NOFILE=57987!
 	if ($n > 1024 && !$ENV{TEST_EXPENSIVE}) {