X-Git-Url: http://www.git.stargrave.org/?a=blobdiff_plain;f=t%2Fspawn.t;h=a0019202a85aaf8da3958c86a94423fe8ce82ab8;hb=3d83cc1dae085b0bc2044cb82aa86e35a8b5172a;hp=5abedc96b727b186a6bd1998b4cdec980ae24795;hpb=721368cd04bfbd03c0d9173fff633ae34f16409a;p=public-inbox.git

diff --git a/t/spawn.t b/t/spawn.t
index 5abedc96..a0019202 100644
--- a/t/spawn.t
+++ b/t/spawn.t
@@ -1,9 +1,10 @@
-# Copyright (C) 2015-2018 all contributors <meta@public-inbox.org>
+# Copyright (C) 2015-2020 all contributors <meta@public-inbox.org>
 # License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
 use strict;
 use warnings;
 use Test::More;
 use PublicInbox::Spawn qw(which spawn popen_rd);
+use PublicInbox::Sigfd;
 
 {
 	my $true = which('true');
@@ -17,6 +18,32 @@ use PublicInbox::Spawn qw(which spawn popen_rd);
 	is($?, 0, 'true exited successfully');
 }
 
+{ # ensure waitpid(-1, 0) and SIGCHLD works in spawned process
+	my $script = <<'EOF';
+$| = 1; # unbuffer stdout
+defined(my $pid = fork) or die "fork: $!";
+if ($pid == 0) { exit }
+elsif ($pid > 0) {
+	my $waited = waitpid(-1, 0);
+	$waited == $pid or die "mismatched child $pid != $waited";
+	$? == 0 or die "child err: $>";
+	$SIG{CHLD} = sub { print "HI\n"; exit };
+	print "RDY $$\n";
+	select(undef, undef, undef, 0.01) while 1;
+}
+EOF
+	my $oldset = PublicInbox::Sigfd::block_signals();
+	my $rd = popen_rd([$^X, '-e', $script]);
+	diag 'waiting for child to reap grandchild...';
+	chomp(my $line = readline($rd));
+	my ($rdy, $pid) = split(' ', $line);
+	is($rdy, 'RDY', 'got ready signal, waitpid(-1) works in child');
+	ok(kill('CHLD', $pid), 'sent SIGCHLD to child');
+	is(readline($rd), "HI\n", '$SIG{CHLD} works in child');
+	ok(close $rd, 'popen_rd close works');
+	PublicInbox::Sigfd::sig_setmask($oldset);
+}
+
 {
 	my ($r, $w);
 	pipe $r, $w or die "pipe failed: $!";
@@ -31,23 +58,13 @@ use PublicInbox::Spawn qw(which spawn popen_rd);
 	my ($r, $w);
 	pipe $r, $w or die "pipe failed: $!";
 	my $pid = spawn(['sh', '-c', 'echo $HELLO'],
-		{ 'HELLO' => 'world' }, { 1 => fileno($w) });
+		{ 'HELLO' => 'world' }, { 1 => $w });
 	close $w or die "close pipe[1] failed: $!";
 	is(<$r>, "world\n", 'read stdout of spawned from pipe');
 	is(waitpid($pid, 0), $pid, 'waitpid succeeds on spawned process');
 	is($?, 0, 'sh exited successfully');
 }
 
-{
-	my ($r, $w);
-	pipe $r, $w or die "pipe failed: $!";
-	my $pid = spawn(['env'], {}, { -env => 1, 1 => fileno($w) });
-	close $w or die "close pipe[1] failed: $!";
-	ok(!defined(<$r>), 'read stdout of spawned from pipe');
-	is(waitpid($pid, 0), $pid, 'waitpid succeeds on spawned process');
-	is($?, 0, 'env(1) exited successfully');
-}
-
 {
 	my $fh = popen_rd([qw(echo hello)]);
 	ok(fileno($fh) >= 0, 'tied fileno works');
@@ -71,24 +88,13 @@ use PublicInbox::Spawn qw(which spawn popen_rd);
 	is($buf, "hello\n", 'tied gets works');
 	is(sysread($fh, $buf, 6), 0, 'sysread got EOF');
 	$? = 1;
-	close $fh;
+	ok(close($fh), 'close succeeds');
 	is($?, 0, '$? set properly');
 }
 
 {
 	my $fh = popen_rd([qw(false)]);
-	close $fh;
-	isnt($?, 0, '$? set properly: '.$?);
-}
-
-{
-	my ($fh, $pid) = popen_rd([qw(sleep 60)], undef, { Blocking => 0 });
-	ok(defined $pid && $pid > 0, 'returned pid when array requested');
-	is(kill(0, $pid), 1, 'child process is running');
-	ok(!defined(sysread($fh, my $buf, 1)) && $!{EAGAIN},
-	   'sysread returned quickly with EAGAIN');
-	is(kill(9, $pid), 1, 'child process killed early');
-	is(waitpid($pid, 0), $pid, 'child process reapable');
+	ok(!close($fh), 'close fails on false');
 	isnt($?, 0, '$? set properly: '.$?);
 }
 
@@ -100,7 +106,8 @@ SKIP: {
 	my ($r, $w);
 	pipe($r, $w) or die "pipe: $!";
 	my $cmd = ['sh', '-c', 'while true; do :; done'];
-	my $opt = { RLIMIT_CPU => [ 1, 1 ], RLIMIT_CORE => 0, 1 => fileno($w) };
+	my $fd = fileno($w);
+	my $opt = { RLIMIT_CPU => [ 1, 1 ], RLIMIT_CORE => [ 0, 0 ], 1 => $fd };
 	my $pid = spawn($cmd, undef, $opt);
 	close $w or die "close(w): $!";
 	my $rset = '';