kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
Browse Source

Merge branch 'dt/tests-with-env-not-subshell' 

* dt/tests-with-env-not-subshell:
  tests: use "env" to run commands with temporary env-var settings
maint
Junio C Hamano 11 years ago
parent
96e67c86f8 512477b175
commit
fa73d35468
12 changed files with 42 additions and 152 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      t/t1300-repo-config.sh
  2. 4
      t/t1510-repo-setup.sh
  3. 12
      t/t3200-branch.sh
  4. 22
      t/t3301-notes.sh
  5. 69
      t/t3404-rebase-interactive.sh
  6. 6
      t/t3413-rebase-hook.sh
  7. 14
      t/t4014-format-patch.sh
  8. 4
      t/t5305-include-tag.sh
  9. 13
      t/t5602-clone-remote-exec.sh
  10. 6
      t/t5801-remote-helpers.sh
  11. 9
      t/t6006-rev-list-format.sh
  12. 18
      t/t7006-pager.sh

17
t/t1300-repo-config.sh
Unescape View File

@ -974,24 +974,15 @@ test_expect_success SYMLINKS 'symlinked configuration' '
' '


test_expect_success 'nonexistent configuration' ' test_expect_success 'nonexistent configuration' '
( test_must_fail env GIT_CONFIG=doesnotexist git config --list &&
GIT_CONFIG=doesnotexist && test_must_fail env GIT_CONFIG=doesnotexist git config test.xyzzy
export GIT_CONFIG &&
test_must_fail git config --list &&
test_must_fail git config test.xyzzy
)
' '


test_expect_success SYMLINKS 'symlink to nonexistent configuration' ' test_expect_success SYMLINKS 'symlink to nonexistent configuration' '
ln -s doesnotexist linktonada && ln -s doesnotexist linktonada &&
ln -s linktonada linktolinktonada && ln -s linktonada linktolinktonada &&
( test_must_fail env GIT_CONFIG=linktonada git config --list &&
GIT_CONFIG=linktonada && test_must_fail env GIT_CONFIG=linktolinktonada git config --list
export GIT_CONFIG &&
test_must_fail git config --list &&
GIT_CONFIG=linktolinktonada &&
test_must_fail git config --list
)
' '


test_expect_success 'check split_cmdline return' " test_expect_success 'check split_cmdline return' "

4
t/t1510-repo-setup.sh
Unescape View File

@ -777,9 +777,7 @@ test_expect_success '#30: core.worktree and core.bare conflict (gitfile version)
setup_repo 30 "$here/30" gitfile true && setup_repo 30 "$here/30" gitfile true &&
( (
cd 30 && cd 30 &&
GIT_DIR=.git && test_must_fail env GIT_DIR=.git git symbolic-ref HEAD 2>result
export GIT_DIR &&
test_must_fail git symbolic-ref HEAD 2>result
) && ) &&
grep "core.bare and core.worktree" 30/result grep "core.bare and core.worktree" 30/result
' '

12
t/t3200-branch.sh
Unescape View File

@ -859,11 +859,7 @@ test_expect_success 'detect typo in branch name when using --edit-description' '
write_script editor <<-\EOF && write_script editor <<-\EOF &&
echo "New contents" >"$1" echo "New contents" >"$1"
EOF EOF
( test_must_fail env EDITOR=./editor git branch --edit-description no-such-branch
EDITOR=./editor &&
export EDITOR &&
test_must_fail git branch --edit-description no-such-branch
)
' '


test_expect_success 'refuse --edit-description on unborn branch for now' ' test_expect_success 'refuse --edit-description on unborn branch for now' '
@ -871,11 +867,7 @@ test_expect_success 'refuse --edit-description on unborn branch for now' '
echo "New contents" >"$1" echo "New contents" >"$1"
EOF EOF
git checkout --orphan unborn && git checkout --orphan unborn &&
( test_must_fail env EDITOR=./editor git branch --edit-description
EDITOR=./editor &&
export EDITOR &&
test_must_fail git branch --edit-description
)
' '


test_expect_success '--merged catches invalid object names' ' test_expect_success '--merged catches invalid object names' '

22
t/t3301-notes.sh
Unescape View File

@ -17,7 +17,7 @@ GIT_EDITOR=./fake_editor.sh
export GIT_EDITOR export GIT_EDITOR


test_expect_success 'cannot annotate non-existing HEAD' ' test_expect_success 'cannot annotate non-existing HEAD' '
(MSG=3 && export MSG && test_must_fail git notes add) test_must_fail env MSG=3 git notes add
' '


test_expect_success setup ' test_expect_success setup '
@ -32,22 +32,16 @@ test_expect_success setup '
' '


test_expect_success 'need valid notes ref' ' test_expect_success 'need valid notes ref' '
(MSG=1 GIT_NOTES_REF=/ && export MSG GIT_NOTES_REF && test_must_fail env MSG=1 GIT_NOTES_REF=/ git notes show &&
test_must_fail git notes add) && test_must_fail env MSG=2 GIT_NOTES_REF=/ git notes show
(MSG=2 GIT_NOTES_REF=/ && export MSG GIT_NOTES_REF &&
test_must_fail git notes show)
' '


test_expect_success 'refusing to add notes in refs/heads/' ' test_expect_success 'refusing to add notes in refs/heads/' '
(MSG=1 GIT_NOTES_REF=refs/heads/bogus && test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes add
export MSG GIT_NOTES_REF &&
test_must_fail git notes add)
' '


test_expect_success 'refusing to edit notes in refs/remotes/' ' test_expect_success 'refusing to edit notes in refs/remotes/' '
(MSG=1 GIT_NOTES_REF=refs/remotes/bogus && test_must_fail env MSG=1 GIT_NOTES_REF=refs/heads/bogus git notes edit
export MSG GIT_NOTES_REF &&
test_must_fail git notes edit)
' '


# 1 indicates caught gracefully by die, 128 means git-show barked # 1 indicates caught gracefully by die, 128 means git-show barked
@ -865,11 +859,7 @@ test_expect_success 'create note from non-existing note with "git notes add -c"
git add a10 && git add a10 &&
test_tick && test_tick &&
git commit -m 10th && git commit -m 10th &&
( test_must_fail env MSG="yet another note" git notes add -c deadbeef &&
MSG="yet another note" &&
export MSG &&
test_must_fail git notes add -c deadbeef
) &&
test_must_fail git notes list HEAD test_must_fail git notes list HEAD
' '



69
t/t3404-rebase-interactive.sh
Unescape View File

@ -102,12 +102,8 @@ test_expect_success 'rebase -i with the exec command runs from tree root' '


test_expect_success 'rebase -i with the exec command checks tree cleanness' ' test_expect_success 'rebase -i with the exec command checks tree cleanness' '
git checkout master && git checkout master &&
(
set_fake_editor && set_fake_editor &&
FAKE_LINES="exec_echo_foo_>file1 1" && test_must_fail env FAKE_LINES="exec_echo_foo_>file1 1" git rebase -i HEAD^ &&
export FAKE_LINES &&
test_must_fail git rebase -i HEAD^
) &&
test_cmp_rev master^ HEAD && test_cmp_rev master^ HEAD &&
git reset --hard && git reset --hard &&
git rebase --continue git rebase --continue
@ -116,12 +112,9 @@ test_expect_success 'rebase -i with the exec command checks tree cleanness' '
test_expect_success 'rebase -i with exec of inexistent command' ' test_expect_success 'rebase -i with exec of inexistent command' '
git checkout master && git checkout master &&
test_when_finished "git rebase --abort" && test_when_finished "git rebase --abort" &&
(
set_fake_editor && set_fake_editor &&
FAKE_LINES="exec_this-command-does-not-exist 1" && test_must_fail env FAKE_LINES="exec_this-command-does-not-exist 1" \
export FAKE_LINES && git rebase -i HEAD^ >actual 2>&1 &&
test_must_fail git rebase -i HEAD^ >actual 2>&1
) &&
! grep "Maybe git-rebase is broken" actual ! grep "Maybe git-rebase is broken" actual
' '


@ -375,11 +368,7 @@ test_expect_success 'commit message used after conflict' '
git checkout -b conflict-fixup conflict-branch && git checkout -b conflict-fixup conflict-branch &&
base=$(git rev-parse HEAD~4) && base=$(git rev-parse HEAD~4) &&
set_fake_editor && set_fake_editor &&
( test_must_fail env FAKE_LINES="1 fixup 3 fixup 4" git rebase -i $base &&
FAKE_LINES="1 fixup 3 fixup 4" &&
export FAKE_LINES &&
test_must_fail git rebase -i $base
) &&
echo three > conflict && echo three > conflict &&
git add conflict && git add conflict &&
FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \ FAKE_COMMIT_AMEND="ONCE" EXPECT_HEADER_COUNT=2 \
@ -394,11 +383,7 @@ test_expect_success 'commit message retained after conflict' '
git checkout -b conflict-squash conflict-branch && git checkout -b conflict-squash conflict-branch &&
base=$(git rev-parse HEAD~4) && base=$(git rev-parse HEAD~4) &&
set_fake_editor && set_fake_editor &&
( test_must_fail env FAKE_LINES="1 fixup 3 squash 4" git rebase -i $base &&
FAKE_LINES="1 fixup 3 squash 4" &&
export FAKE_LINES &&
test_must_fail git rebase -i $base
) &&
echo three > conflict && echo three > conflict &&
git add conflict && git add conflict &&
FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \ FAKE_COMMIT_AMEND="TWICE" EXPECT_HEADER_COUNT=2 \
@ -469,11 +454,7 @@ test_expect_success 'interrupted squash works as expected' '
git checkout -b interrupted-squash conflict-branch && git checkout -b interrupted-squash conflict-branch &&
one=$(git rev-parse HEAD~3) && one=$(git rev-parse HEAD~3) &&
set_fake_editor && set_fake_editor &&
( test_must_fail env FAKE_LINES="1 squash 3 2" git rebase -i HEAD~3 &&
FAKE_LINES="1 squash 3 2" &&
export FAKE_LINES &&
test_must_fail git rebase -i HEAD~3
) &&
(echo one; echo two; echo four) > conflict && (echo one; echo two; echo four) > conflict &&
git add conflict && git add conflict &&
test_must_fail git rebase --continue && test_must_fail git rebase --continue &&
@ -487,11 +468,7 @@ test_expect_success 'interrupted squash works as expected (case 2)' '
git checkout -b interrupted-squash2 conflict-branch && git checkout -b interrupted-squash2 conflict-branch &&
one=$(git rev-parse HEAD~3) && one=$(git rev-parse HEAD~3) &&
set_fake_editor && set_fake_editor &&
( test_must_fail env FAKE_LINES="3 squash 1 2" git rebase -i HEAD~3 &&
FAKE_LINES="3 squash 1 2" &&
export FAKE_LINES &&
test_must_fail git rebase -i HEAD~3
) &&
(echo one; echo four) > conflict && (echo one; echo four) > conflict &&
git add conflict && git add conflict &&
test_must_fail git rebase --continue && test_must_fail git rebase --continue &&
@ -528,11 +505,7 @@ test_expect_success 'aborted --continue does not squash commits after "edit"' '
FAKE_LINES="edit 1" git rebase -i HEAD^ && FAKE_LINES="edit 1" git rebase -i HEAD^ &&
echo "edited again" > file7 && echo "edited again" > file7 &&
git add file7 && git add file7 &&
( test_must_fail env FAKE_COMMIT_MESSAGE=" " git rebase --continue &&
FAKE_COMMIT_MESSAGE=" " &&
export FAKE_COMMIT_MESSAGE &&
test_must_fail git rebase --continue
) &&
test $old = $(git rev-parse HEAD) && test $old = $(git rev-parse HEAD) &&
git rebase --abort git rebase --abort
' '
@ -547,11 +520,7 @@ test_expect_success 'auto-amend only edited commits after "edit"' '
echo "and again" > file7 && echo "and again" > file7 &&
git add file7 && git add file7 &&
test_tick && test_tick &&
( test_must_fail env FAKE_COMMIT_MESSAGE="and again" git rebase --continue &&
FAKE_COMMIT_MESSAGE="and again" &&
export FAKE_COMMIT_MESSAGE &&
test_must_fail git rebase --continue
) &&
git rebase --abort git rebase --abort
' '


@ -559,11 +528,7 @@ test_expect_success 'clean error after failed "exec"' '
test_tick && test_tick &&
test_when_finished "git rebase --abort || :" && test_when_finished "git rebase --abort || :" &&
set_fake_editor && set_fake_editor &&
( test_must_fail env FAKE_LINES="1 exec_false" git rebase -i HEAD^ &&
FAKE_LINES="1 exec_false" &&
export FAKE_LINES &&
test_must_fail git rebase -i HEAD^
) &&
echo "edited again" > file7 && echo "edited again" > file7 &&
git add file7 && git add file7 &&
test_must_fail git rebase --continue 2>error && test_must_fail git rebase --continue 2>error &&
@ -947,12 +912,8 @@ test_expect_success 'rebase -i --root retain root commit author and message' '


test_expect_success 'rebase -i --root temporary sentinel commit' ' test_expect_success 'rebase -i --root temporary sentinel commit' '
git checkout B && git checkout B &&
( set_fake_editor &&
set_fake_editor && test_must_fail env FAKE_LINES="2" git rebase -i --root &&
FAKE_LINES="2" &&
export FAKE_LINES &&
test_must_fail git rebase -i --root
) &&
git cat-file commit HEAD | grep "^tree 4b825dc642cb" && git cat-file commit HEAD | grep "^tree 4b825dc642cb" &&
git rebase --abort git rebase --abort
' '
@ -1042,11 +1003,7 @@ test_expect_success 'rebase -i error on commits with \ in message' '
test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" && test_when_finished "git rebase --abort; git reset --hard $current_head; rm -f error" &&
test_commit TO-REMOVE will-conflict old-content && test_commit TO-REMOVE will-conflict old-content &&
test_commit "\temp" will-conflict new-content dummy && test_commit "\temp" will-conflict new-content dummy &&
( test_must_fail env EDITOR=true git rebase -i HEAD^ --onto HEAD^^ 2>error &&
EDITOR=true &&
export EDITOR &&
test_must_fail git rebase -i HEAD^ --onto HEAD^^ 2>error
) &&
test_expect_code 1 grep " emp" error test_expect_code 1 grep " emp" error
' '



6
t/t3413-rebase-hook.sh
Unescape View File

@ -118,11 +118,7 @@ test_expect_success 'pre-rebase hook stops rebase (1)' '
test_expect_success 'pre-rebase hook stops rebase (2)' ' test_expect_success 'pre-rebase hook stops rebase (2)' '
git checkout test && git checkout test &&
git reset --hard side && git reset --hard side &&
( test_must_fail env EDITOR=: git rebase -i master &&
EDITOR=:
export EDITOR
test_must_fail git rebase -i master
) &&
test "z$(git symbolic-ref HEAD)" = zrefs/heads/test && test "z$(git symbolic-ref HEAD)" = zrefs/heads/test &&
test 0 = $(git rev-list HEAD...side | wc -l) test 0 = $(git rev-list HEAD...side | wc -l)
' '

14
t/t4014-format-patch.sh
Unescape View File

@ -764,22 +764,14 @@ test_expect_success 'format-patch --signature="" suppresses signatures' '


test_expect_success TTY 'format-patch --stdout paginates' ' test_expect_success TTY 'format-patch --stdout paginates' '
rm -f pager_used && rm -f pager_used &&
( test_terminal env GIT_PAGER="wc >pager_used" git format-patch --stdout --all &&
GIT_PAGER="wc >pager_used" &&
export GIT_PAGER &&
test_terminal git format-patch --stdout --all
) &&
test_path_is_file pager_used test_path_is_file pager_used
' '


test_expect_success TTY 'format-patch --stdout pagination can be disabled' ' test_expect_success TTY 'format-patch --stdout pagination can be disabled' '
rm -f pager_used && rm -f pager_used &&
( test_terminal env GIT_PAGER="wc >pager_used" git --no-pager format-patch --stdout --all &&
GIT_PAGER="wc >pager_used" && test_terminal env GIT_PAGER="wc >pager_used" git -c "pager.format-patch=false" format-patch --stdout --all &&
export GIT_PAGER &&
test_terminal git --no-pager format-patch --stdout --all &&
test_terminal git -c "pager.format-patch=false" format-patch --stdout --all
) &&
test_path_is_missing pager_used && test_path_is_missing pager_used &&
test_path_is_missing .git/pager_used test_path_is_missing .git/pager_used
' '

4
t/t5305-include-tag.sh
Unescape View File

@ -45,9 +45,7 @@ test_expect_success 'unpack objects' '
test_expect_success 'check unpacked result (have commit, no tag)' ' test_expect_success 'check unpacked result (have commit, no tag)' '
git rev-list --objects $commit >list.expect && git rev-list --objects $commit >list.expect &&
( (
GIT_DIR=clone.git && test_must_fail env GIT_DIR=clone.git git cat-file -e $tag &&
export GIT_DIR &&
test_must_fail git cat-file -e $tag &&
git rev-list --objects $commit git rev-list --objects $commit
) >list.actual && ) >list.actual &&
test_cmp list.expect list.actual test_cmp list.expect list.actual

13
t/t5602-clone-remote-exec.sh
Unescape View File

@ -12,21 +12,14 @@ test_expect_success setup '
' '


test_expect_success 'clone calls git upload-pack unqualified with no -u option' ' test_expect_success 'clone calls git upload-pack unqualified with no -u option' '
( test_must_fail env GIT_SSH=./not_ssh git clone localhost:/path/to/repo junk &&
GIT_SSH=./not_ssh &&
export GIT_SSH &&
test_must_fail git clone localhost:/path/to/repo junk
) &&
echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected && echo "localhost git-upload-pack '\''/path/to/repo'\''" >expected &&
test_cmp expected not_ssh_output test_cmp expected not_ssh_output
' '


test_expect_success 'clone calls specified git upload-pack with -u option' ' test_expect_success 'clone calls specified git upload-pack with -u option' '
( test_must_fail env GIT_SSH=./not_ssh \
GIT_SSH=./not_ssh && git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk &&
export GIT_SSH &&
test_must_fail git clone -u ./something/bin/git-upload-pack localhost:/path/to/repo junk
) &&
echo "localhost ./something/bin/git-upload-pack '\''/path/to/repo'\''" >expected && echo "localhost ./something/bin/git-upload-pack '\''/path/to/repo'\''" >expected &&
test_cmp expected not_ssh_output test_cmp expected not_ssh_output
' '

6
t/t5801-remote-helpers.sh
Unescape View File

@ -231,10 +231,8 @@ test_expect_success 'proper failure checks for fetching' '
' '


test_expect_success 'proper failure checks for pushing' ' test_expect_success 'proper failure checks for pushing' '
(GIT_REMOTE_TESTGIT_FAILURE=1 && (cd local &&
export GIT_REMOTE_TESTGIT_FAILURE && test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all
cd local &&
test_must_fail git push --all
) )
' '



9
t/t6006-rev-list-format.sh
Unescape View File

@ -190,12 +190,9 @@ test_expect_success '%C(auto) respects --no-color' '
' '


test_expect_success TTY '%C(auto) respects --color=auto (stdout is tty)' ' test_expect_success TTY '%C(auto) respects --color=auto (stdout is tty)' '
( test_terminal env TERM=vt100 \
TERM=vt100 && export TERM && git log --format=$AUTO_COLOR -1 --color=auto >actual &&
test_terminal \ has_color actual
git log --format=$AUTO_COLOR -1 --color=auto >actual &&
has_color actual
)
' '


test_expect_success '%C(auto) respects --color=auto (stdout not tty)' ' test_expect_success '%C(auto) respects --color=auto (stdout not tty)' '

18
t/t7006-pager.sh
Unescape View File

@ -146,11 +146,7 @@ test_expect_success 'no color when stdout is a regular file' '
test_expect_success TTY 'color when writing to a pager' ' test_expect_success TTY 'color when writing to a pager' '
rm -f paginated.out && rm -f paginated.out &&
test_config color.ui auto && test_config color.ui auto &&
( test_terminal env TERM=vt100 git log &&
TERM=vt100 &&
export TERM &&
test_terminal git log
) &&
colorful paginated.out colorful paginated.out
' '


@ -158,11 +154,7 @@ test_expect_success TTY 'colors are suppressed by color.pager' '
rm -f paginated.out && rm -f paginated.out &&
test_config color.ui auto && test_config color.ui auto &&
test_config color.pager false && test_config color.pager false &&
( test_terminal env TERM=vt100 git log &&
TERM=vt100 &&
export TERM &&
test_terminal git log
) &&
! colorful paginated.out ! colorful paginated.out
' '


@ -181,11 +173,7 @@ test_expect_success 'color when writing to a file intended for a pager' '
test_expect_success TTY 'colors are sent to pager for external commands' ' test_expect_success TTY 'colors are sent to pager for external commands' '
test_config alias.externallog "!git log" && test_config alias.externallog "!git log" &&
test_config color.ui auto && test_config color.ui auto &&
( test_terminal env TERM=vt100 git -p externallog &&
TERM=vt100 &&
export TERM &&
test_terminal git -p externallog
) &&
colorful paginated.out colorful paginated.out
' '



Write Preview
Loading…
Cancel
Save