microsoft
/
git
зеркало из https://github.com/microsoft/git.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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
This commit is contained in:
Junio C Hamano 2020-10-05 14:01:50 -07:00
Родитель 0cf28f6d47 f33f2d3d54
Коммит 58138d3f26
11 изменённых файлов: 97 добавлений и 97 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
builtin/fast-export.c
Просмотреть файл

@ -1026,7 +1026,7 @@ static void handle_tags_and_duplicates(struct string_list *extras)
/* /*
* Getting here means we have a commit which * Getting here means we have a commit which
* was excluded by a negative refspec (e.g. * was excluded by a negative refspec (e.g.
* fast-export ^master master). If we are * fast-export ^HEAD HEAD). If we are
* referencing excluded commits, set the ref * referencing excluded commits, set the ref
* to the exact commit. Otherwise, the user * to the exact commit. Otherwise, the user
* wants the branch exported but every commit * wants the branch exported but every commit

34
t/t3200-branch.sh
Просмотреть файл

@ -234,10 +234,10 @@ test_expect_success 'git branch -M master master should work when master is chec
git branch -M master master git branch -M master master
' '
test_expect_success 'git branch -M master2 master2 should work when master is checked out' ' test_expect_success 'git branch -M topic topic should work when master is checked out' '
git checkout master && git checkout master &&
git branch master2 && git branch topic &&
git branch -M master2 master2 git branch -M topic topic
' '
test_expect_success 'git branch -v -d t should work' ' test_expect_success 'git branch -v -d t should work' '
@ -324,8 +324,8 @@ test_expect_success 'git branch --list -v with --abbrev' '
test_expect_success 'git branch --column' ' test_expect_success 'git branch --column' '
COLUMNS=81 git branch --column=column >actual && COLUMNS=81 git branch --column=column >actual &&
cat >expect <<\EOF && cat >expect <<\EOF &&
a/b/c bam foo l * master mb o/o q a/b/c bam foo l * master n o/p r
abc bar j/k m/m master2 n o/p r abc bar j/k m/m mb o/o q topic
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -346,13 +346,13 @@ test_expect_success 'git branch --column with an extremely long branch name' '
l l
m/m m/m
* master * master
master2
mb mb
n n
o/o o/o
o/p o/p
q q
r r
topic
$long $long
EOF EOF
test_cmp expect actual test_cmp expect actual
@ -365,8 +365,8 @@ test_expect_success 'git branch with column.*' '
git config --unset column.branch && git config --unset column.branch &&
git config --unset column.ui && git config --unset column.ui &&
cat >expect <<\EOF && cat >expect <<\EOF &&
a/b/c bam foo l * master mb o/o q a/b/c bam foo l * master n o/p r
abc bar j/k m/m master2 n o/p r abc bar j/k m/m mb o/o q topic
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -377,7 +377,7 @@ test_expect_success 'git branch --column -v should fail' '
test_expect_success 'git branch -v with column.ui ignored' ' test_expect_success 'git branch -v with column.ui ignored' '
git config column.ui column && git config column.ui column &&
COLUMNS=80 git branch -v | cut -c -10 | sed "s/ *$//" >actual && COLUMNS=80 git branch -v | cut -c -9 | sed "s/ *$//" >actual &&
git config --unset column.ui && git config --unset column.ui &&
cat >expect <<\EOF && cat >expect <<\EOF &&
a/b/c a/b/c
@ -389,13 +389,13 @@ test_expect_success 'git branch -v with column.ui ignored' '
l l
m/m m/m
* master * master
master2
mb mb
n n
o/o o/o
o/p o/p
q q
r r
topic
EOF EOF
test_cmp expect actual test_cmp expect actual
' '
@ -597,10 +597,10 @@ test_expect_success 'git branch -C master master should work when master is chec
git branch -C master master git branch -C master master
' '
test_expect_success 'git branch -C master5 master5 should work when master is checked out' ' test_expect_success 'git branch -C main5 main5 should work when master is checked out' '
git checkout master && git checkout master &&
git branch master5 && git branch main5 &&
git branch -C master5 master5 git branch -C main5 main5
' '
test_expect_success 'git branch -C ab cd should overwrite existing config for cd' ' test_expect_success 'git branch -C ab cd should overwrite existing config for cd' '
@ -711,11 +711,11 @@ test_expect_success 'deleting a self-referential symref' '
' '
test_expect_success 'renaming a symref is not allowed' ' test_expect_success 'renaming a symref is not allowed' '
git symbolic-ref refs/heads/master2 refs/heads/master && git symbolic-ref refs/heads/topic refs/heads/master &&
test_must_fail git branch -m master2 master3 && test_must_fail git branch -m topic new-topic &&
git symbolic-ref refs/heads/master2 && git symbolic-ref refs/heads/topic &&
test_path_is_file .git/refs/heads/master && test_path_is_file .git/refs/heads/master &&
test_path_is_missing .git/refs/heads/master3 test_path_is_missing .git/refs/heads/new-topic
' '
test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' ' test_expect_success SYMLINKS 'git branch -m u v should fail when the reflog for u is a symlink' '

42
t/t3427-rebase-subtree.sh
Просмотреть файл

@ -15,12 +15,12 @@ commit_message() {
# this test script tries to document them. First, the following commit history # this test script tries to document them. First, the following commit history
# is generated (the onelines are shown, time flows from left to right): # is generated (the onelines are shown, time flows from left to right):
# #
# master1 - master2 - master3 # topic_1 - topic_2 - topic_3
# \ # \
# README ---------------------- Add subproject master - master4 - files_subtree/master5 # README ---------------------- Add subproject master - topic_4 - files_subtree/topic_5
# #
# Where the merge moves the files master[123].t into the subdirectory # Where the merge moves the files master[123].t into the subdirectory
# files_subtree/ and master4 as well as files_subtree/master5 add files to that # files_subtree/ and topic_4 as well as files_subtree/topic_5 add files to that
# directory directly. # directory directly.
# #
# Then, in subsequent test cases, `git filter-branch` is used to distill just # Then, in subsequent test cases, `git filter-branch` is used to distill just
@ -28,11 +28,11 @@ commit_message() {
# an empty commit is added on top. The pre-rebase commit history looks like # an empty commit is added on top. The pre-rebase commit history looks like
# this: # this:
# #
# Add subproject master - master4 - files_subtree/master5 - Empty commit # Add subproject master - topic_4 - files_subtree/topic_5 - Empty commit
# #
# where the root commit adds three files: master1.t, master2.t and master3.t. # where the root commit adds three files: topic_1.t, topic_2.t and topic_3.t.
# #
# This commit history is then rebased onto `master3` with the # This commit history is then rebased onto `topic_3` with the
# `-Xsubtree=files_subtree` option in three different ways: # `-Xsubtree=files_subtree` option in three different ways:
# #
# 1. using `--preserve-merges` # 1. using `--preserve-merges`
@ -43,9 +43,9 @@ test_expect_success 'setup' '
test_commit README && test_commit README &&
git init files && git init files &&
test_commit -C files master1 && test_commit -C files topic_1 &&
test_commit -C files master2 && test_commit -C files topic_2 &&
test_commit -C files master3 && test_commit -C files topic_3 &&
: perform subtree merge into files_subtree/ && : perform subtree merge into files_subtree/ &&
git fetch files refs/heads/master:refs/heads/files-master && git fetch files refs/heads/master:refs/heads/files-master &&
@ -55,8 +55,8 @@ test_expect_success 'setup' '
git commit -m "Add subproject master" && git commit -m "Add subproject master" &&
: add two extra commits to rebase && : add two extra commits to rebase &&
test_commit -C files_subtree master4 && test_commit -C files_subtree topic_4 &&
test_commit files_subtree/master5 && test_commit files_subtree/topic_5 &&
git checkout -b to-rebase && git checkout -b to-rebase &&
git fast-export --no-data HEAD -- files_subtree/ | git fast-export --no-data HEAD -- files_subtree/ |
@ -66,22 +66,22 @@ test_expect_success 'setup' '
git commit -m "Empty commit" --allow-empty git commit -m "Empty commit" --allow-empty
' '
# FAILURE: Does not preserve master4. # FAILURE: Does not preserve topic_4.
test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' ' test_expect_failure REBASE_P 'Rebase -Xsubtree --preserve-merges --onto commit' '
reset_rebase && reset_rebase &&
git checkout -b rebase-preserve-merges to-rebase && git checkout -b rebase-preserve-merges to-rebase &&
git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master && git rebase -Xsubtree=files_subtree --preserve-merges --onto files-master master &&
verbose test "$(commit_message HEAD~)" = "master4" && verbose test "$(commit_message HEAD~)" = "topic_4" &&
verbose test "$(commit_message HEAD)" = "files_subtree/master5" verbose test "$(commit_message HEAD)" = "files_subtree/topic_5"
' '
# FAILURE: Does not preserve master4. # FAILURE: Does not preserve topic_4.
test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' ' test_expect_failure REBASE_P 'Rebase -Xsubtree --keep-empty --preserve-merges --onto commit' '
reset_rebase && reset_rebase &&
git checkout -b rebase-keep-empty to-rebase && git checkout -b rebase-keep-empty to-rebase &&
git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master && git rebase -Xsubtree=files_subtree --keep-empty --preserve-merges --onto files-master master &&
verbose test "$(commit_message HEAD~2)" = "master4" && verbose test "$(commit_message HEAD~2)" = "topic_4" &&
verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
verbose test "$(commit_message HEAD)" = "Empty commit" verbose test "$(commit_message HEAD)" = "Empty commit"
' '
@ -91,8 +91,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --onto commit' '
test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master && test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --onto files-master master &&
: first pick results in no changes && : first pick results in no changes &&
git rebase --skip && git rebase --skip &&
verbose test "$(commit_message HEAD~2)" = "master4" && verbose test "$(commit_message HEAD~2)" = "topic_4" &&
verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
verbose test "$(commit_message HEAD)" = "Empty commit" verbose test "$(commit_message HEAD)" = "Empty commit"
' '
@ -102,8 +102,8 @@ test_expect_success 'Rebase -Xsubtree --empty=ask --rebase-merges --onto commit'
test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root && test_must_fail git rebase -Xsubtree=files_subtree --empty=ask --rebase-merges --onto files-master --root &&
: first pick results in no changes && : first pick results in no changes &&
git rebase --skip && git rebase --skip &&
verbose test "$(commit_message HEAD~2)" = "master4" && verbose test "$(commit_message HEAD~2)" = "topic_4" &&
verbose test "$(commit_message HEAD~)" = "files_subtree/master5" && verbose test "$(commit_message HEAD~)" = "files_subtree/topic_5" &&
verbose test "$(commit_message HEAD)" = "Empty commit" verbose test "$(commit_message HEAD)" = "Empty commit"
' '

8
t/t4150-am.sh
Просмотреть файл

@ -465,7 +465,7 @@ test_expect_success 'am changes committer and keeps author' '
test_expect_success 'am --signoff adds Signed-off-by: line' ' test_expect_success 'am --signoff adds Signed-off-by: line' '
rm -fr .git/rebase-apply && rm -fr .git/rebase-apply &&
git reset --hard && git reset --hard &&
git checkout -b master2 first && git checkout -b topic_2 first &&
git am --signoff <patch2 && git am --signoff <patch2 &&
{ {
printf "third\n\nSigned-off-by: %s <%s>\n\n" \ printf "third\n\nSigned-off-by: %s <%s>\n\n" \
@ -479,7 +479,7 @@ test_expect_success 'am --signoff adds Signed-off-by: line' '
' '
test_expect_success 'am stays in branch' ' test_expect_success 'am stays in branch' '
echo refs/heads/master2 >expected && echo refs/heads/topic_2 >expected &&
git symbolic-ref HEAD >actual && git symbolic-ref HEAD >actual &&
test_cmp expected actual test_cmp expected actual
' '
@ -540,7 +540,7 @@ test_expect_success 'am without --keep removes Re: and [PATCH] stuff' '
git reset --hard HEAD^ && git reset --hard HEAD^ &&
git am <patch4 && git am <patch4 &&
git rev-parse HEAD >expected && git rev-parse HEAD >expected &&
git rev-parse master2 >actual && git rev-parse topic_2 >actual &&
test_cmp expected actual test_cmp expected actual
' '
@ -567,7 +567,7 @@ test_expect_success 'am --keep-non-patch really keeps the non-patch part' '
test_expect_success 'setup am -3' ' test_expect_success 'setup am -3' '
rm -fr .git/rebase-apply && rm -fr .git/rebase-apply &&
git reset --hard && git reset --hard &&
git checkout -b base3way master2 && git checkout -b base3way topic_2 &&
sed -n -e "3,\$p" msg >file && sed -n -e "3,\$p" msg >file &&
head -n 9 msg >>file && head -n 9 msg >>file &&
git add file && git add file &&

6
t/t5515-fetch-merge-logic.sh
Просмотреть файл

@ -15,7 +15,7 @@ export GIT_TEST_PROTOCOL_VERSION
build_script () { build_script () {
script="$1" && script="$1" &&
for i in one three_file master master2 one_tree three two two2 three2 for i in one three_file master topic_2 one_tree three two two2 three2
do do
echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script" echo "s/$(test_oid --hash=sha1 "$i")/$(test_oid "$i")/g" >>"$script"
done done
@ -52,8 +52,8 @@ test_expect_success setup '
two sha1:525b7fb068d59950d185a8779dc957c77eed73ba two sha1:525b7fb068d59950d185a8779dc957c77eed73ba
two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db two sha256:3b21de3440cd38c2a9e9b464adb923f7054949ed4c918e1a0ac4c95cd52774db
master2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f topic_2 sha1:754b754407bf032e9a2f9d5a9ad05ca79a6b228f
master2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0 topic_2 sha256:6c7abaea8a6d8ef4d89877e68462758dc6774690fbbbb0e6d7dd57415c9abde0
two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8 two2 sha1:6134ee8f857693b96ff1cc98d3e2fd62b199e5a8
two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4 two2 sha256:87a2d3ee29c83a3dc7afd41c0606b11f67603120b910a7be7840accdc18344d4

20
t/t5523-push-upstream.sh
Просмотреть файл

@ -41,20 +41,20 @@ test_expect_success 'push -u --dry-run master:otherX' '
check_config master upstream refs/heads/other check_config master upstream refs/heads/other
' '
test_expect_success 'push -u master2:master2' ' test_expect_success 'push -u topic_2:topic_2' '
git branch master2 && git branch topic_2 &&
git push -u upstream master2:master2 && git push -u upstream topic_2:topic_2 &&
check_config master2 upstream refs/heads/master2 check_config topic_2 upstream refs/heads/topic_2
' '
test_expect_success 'push -u master2:other2' ' test_expect_success 'push -u topic_2:other2' '
git push -u upstream master2:other2 && git push -u upstream topic_2:other2 &&
check_config master2 upstream refs/heads/other2 check_config topic_2 upstream refs/heads/other2
' '
test_expect_success 'push -u :master2' ' test_expect_success 'push -u :topic_2' '
git push -u upstream :master2 && git push -u upstream :topic_2 &&
check_config master2 upstream refs/heads/other2 check_config topic_2 upstream refs/heads/other2
' '
test_expect_success 'push -u --all' ' test_expect_success 'push -u --all' '

6
t/t6018-rev-list-glob.sh
Просмотреть файл

@ -32,11 +32,11 @@ test_expect_success 'setup' '
git checkout -b someref master && git checkout -b someref master &&
commit some && commit some &&
git checkout master && git checkout master &&
commit master2 && commit topic_2 &&
git tag foo/bar master && git tag foo/bar master &&
commit master3 && commit topic_3 &&
git update-ref refs/remotes/foo/baz master && git update-ref refs/remotes/foo/baz master &&
commit master4 && commit topic_4 &&
git update-ref refs/remotes/upstream/one subspace/one && git update-ref refs/remotes/upstream/one subspace/one &&
git update-ref refs/remotes/upstream/two subspace/two && git update-ref refs/remotes/upstream/two subspace/two &&
git update-ref refs/remotes/upstream/x subspace-x && git update-ref refs/remotes/upstream/x subspace-x &&

20
t/t6040-tracking-info.sh
Просмотреть файл

@ -264,25 +264,25 @@ test_expect_success 'fail to track annotated tags' '
test_expect_success '--set-upstream-to does not change branch' ' test_expect_success '--set-upstream-to does not change branch' '
git branch from-master master && git branch from-master master &&
git branch --set-upstream-to master from-master && git branch --set-upstream-to master from-master &&
git branch from-master2 master && git branch from-topic_2 master &&
test_must_fail git config branch.from-master2.merge > actual && test_must_fail git config branch.from-topic_2.merge > actual &&
git rev-list from-master2 && git rev-list from-topic_2 &&
git update-ref refs/heads/from-master2 from-master2^ && git update-ref refs/heads/from-topic_2 from-topic_2^ &&
git rev-parse from-master2 >expect2 && git rev-parse from-topic_2 >expect2 &&
git branch --set-upstream-to master from-master2 && git branch --set-upstream-to master from-topic_2 &&
git config branch.from-master.merge > actual && git config branch.from-master.merge > actual &&
git rev-parse from-master2 >actual2 && git rev-parse from-topic_2 >actual2 &&
grep -q "^refs/heads/master$" actual && grep -q "^refs/heads/master$" actual &&
cmp expect2 actual2 cmp expect2 actual2
' '
test_expect_success '--set-upstream-to @{-1}' ' test_expect_success '--set-upstream-to @{-1}' '
git checkout follower && git checkout follower &&
git checkout from-master2 && git checkout from-topic_2 &&
git config branch.from-master2.merge > expect2 && git config branch.from-topic_2.merge > expect2 &&
git branch --set-upstream-to @{-1} from-master && git branch --set-upstream-to @{-1} from-master &&
git config branch.from-master.merge > actual && git config branch.from-master.merge > actual &&
git config branch.from-master2.merge > actual2 && git config branch.from-topic_2.merge > actual2 &&
git branch --set-upstream-to follower from-master && git branch --set-upstream-to follower from-master &&
git config branch.from-master.merge > expect && git config branch.from-master.merge > expect &&
test_cmp expect2 actual2 && test_cmp expect2 actual2 &&

14
t/t6409-merge-subtree.sh
Просмотреть файл

@ -94,10 +94,10 @@ test_expect_success 'merge update' '
echo git-gui2 > git-gui.sh && echo git-gui2 > git-gui.sh &&
o3=$(git hash-object git-gui.sh) && o3=$(git hash-object git-gui.sh) &&
git add git-gui.sh && git add git-gui.sh &&
git checkout -b master2 && git checkout -b topic_2 &&
git commit -m "update git-gui" && git commit -m "update git-gui" &&
cd ../git && cd ../git &&
git pull -s subtree gui master2 && git pull -s subtree gui topic_2 &&
git ls-files -s >actual && git ls-files -s >actual &&
( (
echo "100644 $o3 0 git-gui/git-gui.sh" && echo "100644 $o3 0 git-gui/git-gui.sh" &&
@ -109,7 +109,7 @@ test_expect_success 'merge update' '
test_expect_success 'initial ambiguous subtree' ' test_expect_success 'initial ambiguous subtree' '
cd ../git && cd ../git &&
git reset --hard master && git reset --hard master &&
git checkout -b master2 && git checkout -b topic_2 &&
git merge -s ours --no-commit gui/master && git merge -s ours --no-commit gui/master &&
git read-tree --prefix=git-gui2/ -u gui/master && git read-tree --prefix=git-gui2/ -u gui/master &&
git commit -m "Merge git-gui2 as our subdirectory" && git commit -m "Merge git-gui2 as our subdirectory" &&
@ -125,8 +125,8 @@ test_expect_success 'initial ambiguous subtree' '
test_expect_success 'merge using explicit' ' test_expect_success 'merge using explicit' '
cd ../git && cd ../git &&
git reset --hard master2 && git reset --hard topic_2 &&
git pull -Xsubtree=git-gui gui master2 && git pull -Xsubtree=git-gui gui topic_2 &&
git ls-files -s >actual && git ls-files -s >actual &&
( (
echo "100644 $o3 0 git-gui/git-gui.sh" && echo "100644 $o3 0 git-gui/git-gui.sh" &&
@ -138,8 +138,8 @@ test_expect_success 'merge using explicit' '
test_expect_success 'merge2 using explicit' ' test_expect_success 'merge2 using explicit' '
cd ../git && cd ../git &&
git reset --hard master2 && git reset --hard topic_2 &&
git pull -Xsubtree=git-gui2 gui master2 && git pull -Xsubtree=git-gui2 gui topic_2 &&
git ls-files -s >actual && git ls-files -s >actual &&
( (
echo "100644 $o1 0 git-gui/git-gui.sh" && echo "100644 $o1 0 git-gui/git-gui.sh" &&

10
t/t9902-completion.sh
Просмотреть файл

@ -542,37 +542,37 @@ test_expect_success '__gitcomp - doesnt fail because of invalid variable name' '
' '
read -r -d "" refs <<-\EOF read -r -d "" refs <<-\EOF
main
maint maint
master
next next
seen seen
EOF EOF
test_expect_success '__gitcomp_nl - trailing space' ' test_expect_success '__gitcomp_nl - trailing space' '
test_gitcomp_nl "m" "$refs" <<-EOF test_gitcomp_nl "m" "$refs" <<-EOF
main Z
maint Z maint Z
master Z
EOF EOF
' '
test_expect_success '__gitcomp_nl - prefix' ' test_expect_success '__gitcomp_nl - prefix' '
test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF test_gitcomp_nl "--fixup=m" "$refs" "--fixup=" "m" <<-EOF
--fixup=main Z
--fixup=maint Z --fixup=maint Z
--fixup=master Z
EOF EOF
' '
test_expect_success '__gitcomp_nl - suffix' ' test_expect_success '__gitcomp_nl - suffix' '
test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF test_gitcomp_nl "branch.ma" "$refs" "branch." "ma" "." <<-\EOF
branch.main.Z
branch.maint.Z branch.maint.Z
branch.master.Z
EOF EOF
' '
test_expect_success '__gitcomp_nl - no suffix' ' test_expect_success '__gitcomp_nl - no suffix' '
test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF test_gitcomp_nl "ma" "$refs" "" "ma" "" <<-\EOF
mainZ
maintZ maintZ
masterZ
EOF EOF
' '

32
t/test-terminal.perl
Просмотреть файл

@ -81,24 +81,24 @@ if ($#ARGV < 1) {
die "usage: test-terminal program args"; die "usage: test-terminal program args";
} }
$ENV{TERM} = 'vt100'; $ENV{TERM} = 'vt100';
my $master_in = new IO::Pty; my $parent_in = new IO::Pty;
my $master_out = new IO::Pty; my $parent_out = new IO::Pty;
my $master_err = new IO::Pty; my $parent_err = new IO::Pty;
$master_in->set_raw(); $parent_in->set_raw();
$master_out->set_raw(); $parent_out->set_raw();
$master_err->set_raw(); $parent_err->set_raw();
$master_in->slave->set_raw(); $parent_in->slave->set_raw();
$master_out->slave->set_raw(); $parent_out->slave->set_raw();
$master_err->slave->set_raw(); $parent_err->slave->set_raw();
my $pid = start_child(\@ARGV, $master_in->slave, $master_out->slave, $master_err->slave); my $pid = start_child(\@ARGV, $parent_in->slave, $parent_out->slave, $parent_err->slave);
close $master_in->slave; close $parent_in->slave;
close $master_out->slave; close $parent_out->slave;
close $master_err->slave; close $parent_err->slave;
my $in_pid = copy_stdin($master_in); my $in_pid = copy_stdin($parent_in);
copy_stdio($master_out, $master_err); copy_stdio($parent_out, $parent_err);
my $ret = finish_child($pid); my $ret = finish_child($pid);
# If the child process terminates before our copy_stdin() process is able to # 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. # Send SIGTERM to it to ensure it terminates.
kill 'TERM', $in_pid; kill 'TERM', $in_pid;
finish_child($in_pid); finish_child($in_pid);