X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fds-leak.t;h=72bf037937e544940bacd102326ebfde4eba6c67;hb=256b3566e4d57a64bb349a7b896da10381a2a363;hp=34ffc125ed49a8dfcc975550b4cc4acc299d3ed4;hpb=f2eaf5c929e6a3891b55195cbcaba99d16424933;p=public-inbox.git
diff --git a/t/ds-leak.t b/t/ds-leak.t
index 34ffc125..72bf0379 100644
--- a/t/ds-leak.t
+++ b/t/ds-leak.t
@@ -1,4 +1,4 @@
-# Copyright (C) 2019 all contributors
+# Copyright (C) 2019-2020 all contributors
# Licensed the same as Danga::Socket (and Perl5)
# License: GPL-1.0+ or Artistic-1.0-Perl
#
@@ -6,10 +6,11 @@
use strict;
use warnings;
use Test::More;
+use PublicInbox::TestCommon;
use_ok 'PublicInbox::DS';
if ('close-on-exec for epoll and kqueue') {
- use PublicInbox::Spawn qw(spawn);
+ use PublicInbox::Spawn qw(spawn which);
my $pid;
my $evfd_re = qr/(?:kqueue|eventpoll)/i;
@@ -20,7 +21,7 @@ if ('close-on-exec for epoll and kqueue') {
my ($r, $w);
pipe($r, $w) or die "pipe: $!";
- PublicInbox::DS->AddTimer(0, sub { $pid = spawn([qw(sleep 10)]) });
+ PublicInbox::DS::add_timer(0, sub { $pid = spawn([qw(sleep 10)]) });
PublicInbox::DS->EventLoop;
ok($pid, 'subprocess spawned');
@@ -30,10 +31,12 @@ if ('close-on-exec for epoll and kqueue') {
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: {
- 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) {
@@ -44,8 +47,9 @@ if ('close-on-exec for epoll and kqueue') {
}
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}) {