From: Johannes Schindelin <johannes.schindelin@xxxxxx> In the ongoing effort to make the Git project a more inclusive place, let's try to avoid names like "master" where possible. In this instance, the use of the term `slave` is unfortunately enshrined in IO::Pty's API. We simply cannot avoid using that word here. But at least we can get rid of the usage of the word `master` and hope that IO::Pty will be eventually adjusted, too. Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx> --- t/test-terminal.perl | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/t/test-terminal.perl b/t/test-terminal.perl index 46bf618479..680caf48dd 100755 --- a/t/test-terminal.perl +++ b/t/test-terminal.perl @@ -81,24 +81,24 @@ sub copy_stdio { 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 $primary_in = new IO::Pty; +my $primary_out = new IO::Pty; +my $primary_err = new IO::Pty; +$primary_in->set_raw(); +$primary_out->set_raw(); +$primary_err->set_raw(); +$primary_in->slave->set_raw(); +$primary_out->slave->set_raw(); +$primary_err->slave->set_raw(); +my $pid = start_child(\@ARGV, $primary_in->slave, $primary_out->slave, $primary_err->slave); +close $primary_in->slave; +close $primary_out->slave; +close $primary_err->slave; +my $in_pid = copy_stdin($primary_in); +copy_stdio($primary_out, $primary_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 $primary_in, the copy_stdin() process could stall. # Send SIGTERM to it to ensure it terminates. kill 'TERM', $in_pid; finish_child($in_pid); -- gitgitgadget