From cc4e48fc1eafdb9bec037f10c22708a26fd25ef6 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 17 Oct 2010 02:36:56 +0800 Subject: tests: factor out terminal handling from t7006 Other tests besides the pager ones may want to check how we handle output to a terminal. This patch makes the code reusable. Signed-off-by: Jeff King Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano --- t/t7006/test-terminal.perl | 58 ---------------------------------------------- 1 file changed, 58 deletions(-) delete mode 100755 t/t7006/test-terminal.perl (limited to 't/t7006/test-terminal.perl') diff --git a/t/t7006/test-terminal.perl b/t/t7006/test-terminal.perl deleted file mode 100755 index 73ff80937..000000000 --- a/t/t7006/test-terminal.perl +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/perl -use strict; -use warnings; -use IO::Pty; -use File::Copy; - -# Run @$argv in the background with stdout redirected to $out. -sub start_child { - my ($argv, $out) = @_; - my $pid = fork; - if (not defined $pid) { - die "fork failed: $!" - } elsif ($pid == 0) { - open STDOUT, ">&", $out; - close $out; - exec(@$argv) or die "cannot exec '$argv->[0]': $!" - } - return $pid; -} - -# Wait for $pid to finish. -sub finish_child { - # Simplified from wait_or_whine() in run-command.c. - my ($pid) = @_; - - my $waiting = waitpid($pid, 0); - if ($waiting < 0) { - die "waitpid failed: $!"; - } elsif ($? & 127) { - my $code = $? & 127; - warn "died of signal $code"; - return $code - 128; - } else { - return $? >> 8; - } -} - -sub xsendfile { - my ($out, $in) = @_; - - # Note: the real sendfile() cannot read from a terminal. - - # It is unspecified by POSIX whether reads - # from a disconnected terminal will return - # EIO (as in AIX 4.x, IRIX, and Linux) or - # end-of-file. Either is fine. - copy($in, $out, 4096) or $!{EIO} or die "cannot copy from child: $!"; -} - -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)); -- cgit v1.2.1