undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dd/honor-users-tar-in-tests'

Browse Source 
Test portability fix.

* dd/honor-users-tar-in-tests:
  t: use configured TAR instead of tar
This commit is contained in:
Junio C Hamano 2021-06-14 13:33:28 +09:00
commit c189dba20e
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t3513-revert-submodule.sh
View File

@ -14,7 +14,7 @@ test_description='revert can handle submodules'
git_revert () { git_revert () {
git status -su >expect && git status -su >expect &&
ls -1pR * >>expect && ls -1pR * >>expect &&
tar cf "$TRASH_DIRECTORY/tmp.tar" * && "$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * &&
may_only_be_test_must_fail "$2" && may_only_be_test_must_fail "$2" &&
$2 git checkout "$1" && $2 git checkout "$1" &&
if test -n "$2" if test -n "$2"
@ -23,7 +23,7 @@ git_revert () {
fi && fi &&
git revert HEAD && git revert HEAD &&
rm -rf * && rm -rf * &&
tar xf "$TRASH_DIRECTORY/tmp.tar" && "$TAR" xf "$TRASH_DIRECTORY/tmp.tar" &&
git status -su >actual && git status -su >actual &&
ls -1pR * >>actual && ls -1pR * >>actual &&
test_cmp expect actual && test_cmp expect actual &&

4
t/t6041-bisect-submodule.sh
View File

@ -8,7 +8,7 @@ test_description='bisect can handle submodules'
git_bisect () { git_bisect () {
git status -su >expect && git status -su >expect &&
ls -1pR * >>expect && ls -1pR * >>expect &&
tar cf "$TRASH_DIRECTORY/tmp.tar" * && "$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * &&
GOOD=$(git rev-parse --verify HEAD) && GOOD=$(git rev-parse --verify HEAD) &&
may_only_be_test_must_fail "$2" && may_only_be_test_must_fail "$2" &&
$2 git checkout "$1" && $2 git checkout "$1" &&
@ -25,7 +25,7 @@ git_bisect () {
git bisect start && git bisect start &&
git bisect good $GOOD && git bisect good $GOOD &&
rm -rf * && rm -rf * &&
tar xf "$TRASH_DIRECTORY/tmp.tar" && "$TAR" xf "$TRASH_DIRECTORY/tmp.tar" &&
git status -su >actual && git status -su >actual &&
ls -1pR * >>actual && ls -1pR * >>actual &&
test_cmp expect actual && test_cmp expect actual &&