name-rev: change a "long" variable to timestamp_t

diff --git a/t/test-terminal.perl b/t/test-terminal.perl
index 73ff80937195f3ee8d4bf647a6c06bef23bb8891..96b6a03e1c93c9ab6df356c2aad02514232f76ea 100755 (executable)
--- a/t/test-terminal.perl
+++ b/t/test-terminal.perl
@@ -1,17 +1,21 @@
 #!/usr/bin/perl
+use 5.008;
 use strict;
 use warnings;
 use IO::Pty;
 use File::Copy;
 
-# Run @$argv in the background with stdout redirected to $out.
+# Run @$argv in the background with stdio redirected to $in, $out and $err.
 sub start_child {
-       my ($argv, $out) = @_;
+       my ($argv, $in, $out, $err) = @_;
        my $pid = fork;
        if (not defined $pid) {
                die "fork failed: $!"
        } elsif ($pid == 0) {
+               open STDIN, "<&", $in;
                open STDOUT, ">&", $out;
+               open STDERR, ">&", $err;
+               close $in;
                close $out;
                exec(@$argv) or die "cannot exec '$argv->[0]': $!"
        }
@@ -29,7 +33,7 @@ sub finish_child {
        } elsif ($? & 127) {
                my $code = $? & 127;
                warn "died of signal $code";
-               return $code - 128;
+               return $code + 128;
        } else {
                return $? >> 8;
        }
@@ -47,12 +51,54 @@ sub xsendfile {
        copy($in, $out, 4096) or $!{EIO} or die "cannot copy from child: $!";
 }
 
+sub copy_stdin {
+       my ($in) = @_;
+       my $pid = fork;
+       if (!$pid) {
+               xsendfile($in, \*STDIN);
+               exit 0;
+       }
+       close($in);
+       return $pid;
+}
+
+sub copy_stdio {
+       my ($out, $err) = @_;
+       my $pid = fork;
+       defined $pid or die "fork failed: $!";
+       if (!$pid) {
+               close($out);
+               xsendfile(\*STDERR, $err);
+               exit 0;
+       }
+       close($err);
+       xsendfile(\*STDOUT, $out);
+       finish_child($pid) == 0
+               or exit 1;
+}
+
 if ($#ARGV < 1) {
        die "usage: test-terminal program args";
 }
-my $master = new IO::Pty;
-my $slave = $master->slave;
-my $pid = start_child(\@ARGV, $slave);
-close $slave;
-xsendfile(\*STDOUT, $master);
-exit(finish_child($pid));
+my $master_in = new IO::Pty;
+my $master_out = new IO::Pty;
+my $master_err = new IO::Pty;
+$master_in->set_raw();
+$master_out->set_raw();
+$master_err->set_raw();
+$master_in->slave->set_raw();
+$master_out->slave->set_raw();
+$master_err->slave->set_raw();
+my $pid = start_child(\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave);
+close $master_in->slave;
+close $master_out->slave;
+close $master_err->slave;
+my $in_pid = copy_stdin($master_in);
+copy_stdio($master_out, $master_err);
+my $ret = finish_child($pid);
+# If the child process terminates before our copy_stdin() process is able to
+# write all of its data to $master_in, the copy_stdin() process could stall.
+# Send SIGTERM to it to ensure it terminates.
+kill 'TERM', $in_pid;
+finish_child($in_pid);
+exit($ret);