-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
t7006-pager: if stdout is not a terminal, make a new one
Testing pagination requires (fake or real) access to a terminal so we can see whether the pagination automatically kicks in, which makes it hard to get good coverage when running tests without --verbose. There are a number of ways to work around that: - Replace all isatty calls with calls to a custom xisatty wrapper that usually checks for a terminal but can be overridden for tests. This would be workable, but it would require implementing xisatty separately in three languages (C, shell, and perl) and making sure that any code that is to be tested always uses the wrapper. - Redirect stdout to /dev/tty. This would be problematic because there might be no terminal available, and even if a terminal is available, it might not be appropriate to spew output to it. - Create a new pseudo-terminal on the fly and capture its output. This patch implements the third approach. The new test-terminal.perl helper uses IO::Pty from Expect.pm to create a terminal and executes the program specified by its arguments with that terminal as stdout. If the IO::Pty module is missing or not working on a system, the test script will maintain its old behavior (skipping most of its tests unless GIT_TEST_OPTS includes --verbose). Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information
Jonathan Nieder
authored and
Junio C Hamano
committed
Feb 21, 2010
1 parent
60b6e22
commit 2d3ca21
Showing
2 changed files
with
82 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| #!/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)); |