mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/t5562-racefix'

Browse Source 
Test update.

* jk/t5562-racefix:
  t5562: use alarm() to interrupt timed child-wait
This commit is contained in:
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
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: $!"; defined read($body_fh, $body_data, $body_size) or die "Cannot read $body_filename: $!";
close($body_fh); close($body_fh);
my $exited = 0;
$SIG{"CHLD"} = sub {
$exited = 1;
};
# write data # write data
my $pid = open(my $out, "|-", @command); 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: $!"; print $out $body_data or die "Cannot write data: $!";
sleep 60; # is interrupted by SIGCHLD $SIG{ALRM} = sub {
if (!$exited) { kill 'KILL', $pid;
close($out);
die "Command did not exit after reading whole body"; 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";
} }