diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:50 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-05 21:01:50 (GMT) |
commit | 58138d3f266569f945a7abc86fc897111c47640f (patch) | |
tree | 6d7ff4411df378b5acd9705535d4cd21a19fe65f /t/test-terminal.perl | |
parent | 0cf28f6d4775ca304e3e2028c2645c600e869641 (diff) | |
parent | f33f2d3d54c12462701ea01e81da45e63e2c3087 (diff) | |
download | git-58138d3f266569f945a7abc86fc897111c47640f.zip git-58138d3f266569f945a7abc86fc897111c47640f.tar.gz git-58138d3f266569f945a7abc86fc897111c47640f.tar.bz2 |
Merge branch 'js/default-branch-name-part-2'
Update the tests to drop word 'master' from them.
* js/default-branch-name-part-2:
t9902: avoid using the branch name `master`
tests: avoid variations of the `master` branch name
t3200: avoid variations of the `master` branch name
fast-export: avoid using unnecessary language in a code comment
t/test-terminal: avoid non-inclusive language
Diffstat (limited to 't/test-terminal.perl')
-rwxr-xr-x | t/test-terminal.perl | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/t/test-terminal.perl b/t/test-terminal.perl index 46bf618..1bcf01a 100755 --- a/t/test-terminal.perl +++ b/t/test-terminal.perl @@ -81,24 +81,24 @@ if ($#ARGV < 1) { die "usage: test-terminal program args"; } $ENV{TERM} = 'vt100'; -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 $parent_in = new IO::Pty; +my $parent_out = new IO::Pty; +my $parent_err = new IO::Pty; +$parent_in->set_raw(); +$parent_out->set_raw(); +$parent_err->set_raw(); +$parent_in->slave->set_raw(); +$parent_out->slave->set_raw(); +$parent_err->slave->set_raw(); +my $pid = start_child(\@ARGV, $parent_in->slave, $parent_out->slave, $parent_err->slave); +close $parent_in->slave; +close $parent_out->slave; +close $parent_err->slave; +my $in_pid = copy_stdin($parent_in); +copy_stdio($parent_out, $parent_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. +# write all of its data to $parent_in, the copy_stdin() process could stall. # Send SIGTERM to it to ensure it terminates. kill 'TERM', $in_pid; finish_child($in_pid); |