kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/t5562-racefix' 

Test update.

* jk/t5562-racefix:
  t5562: use alarm() to interrupt timed child-wait
maint
Junio C Hamano 2021-09-20 15:20:46 -07:00
parent 2a6d0b2b68 e8f55568de
commit 71e36361bf
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
t/t5562/invoke-with-content-length.pl
View File

@ -13,11 +13,6 @@ my $body_data;
defined read($body_fh, $body_data, $body_size) or die "Cannot read $body_filename: $!";
close($body_fh);

my $exited = 0;
$SIG{"CHLD"} = sub {
$exited = 1;
};

# write data
my $pid = open(my $out, "|-", @command);
{
@ -29,8 +24,13 @@ my $pid = open(my $out, "|-", @command);
}
print $out $body_data or die "Cannot write data: $!";

sleep 60; # is interrupted by SIGCHLD
if (!$exited) {
close($out);
$SIG{ALRM} = sub {
kill 'KILL', $pid;
die "Command did not exit after reading whole body";
};
alarm 60;

my $ret = waitpid($pid, 0);
if ($ret != $pid) {
die "confusing return from waitpid: $ret";
}