summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2021-06-14 04:33:28 (GMT)
committerJunio C Hamano <gitster@pobox.com>2021-06-14 04:33:28 (GMT)
commitc189dba20e6d94e4408bcc6ad298f0c157f05b43 (patch)
tree4cb3d1a1db0f954b8184cb4dd79383d44890fcc8
parentd9d3b76feedc74d50221ca7b8efd84d4c0db2c05 (diff)
parent5317dfeaed30fbe647899ece261e3dd40e5ced1f (diff)
downloadgit-c189dba20e6d94e4408bcc6ad298f0c157f05b43.zip
git-c189dba20e6d94e4408bcc6ad298f0c157f05b43.tar.gz
git-c189dba20e6d94e4408bcc6ad298f0c157f05b43.tar.bz2
Merge branch 'dd/honor-users-tar-in-tests'
Test portability fix. * dd/honor-users-tar-in-tests: t: use configured TAR instead of tar
-rwxr-xr-xt/t3513-revert-submodule.sh4
-rwxr-xr-xt/t6041-bisect-submodule.sh4
2 files changed, 4 insertions, 4 deletions
diff --git a/t/t3513-revert-submodule.sh b/t/t3513-revert-submodule.sh
index 74cd96e..8bfe3ed 100755
--- a/t/t3513-revert-submodule.sh
+++ b/t/t3513-revert-submodule.sh
@@ -14,7 +14,7 @@ test_description='revert can handle submodules'
git_revert () {
git status -su >expect &&
ls -1pR * >>expect &&
- tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
+ "$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * &&
may_only_be_test_must_fail "$2" &&
$2 git checkout "$1" &&
if test -n "$2"
@@ -23,7 +23,7 @@ git_revert () {
fi &&
git revert HEAD &&
rm -rf * &&
- tar xf "$TRASH_DIRECTORY/tmp.tar" &&
+ "$TAR" xf "$TRASH_DIRECTORY/tmp.tar" &&
git status -su >actual &&
ls -1pR * >>actual &&
test_cmp expect actual &&
diff --git a/t/t6041-bisect-submodule.sh b/t/t6041-bisect-submodule.sh
index df1eff0..82013fc 100755
--- a/t/t6041-bisect-submodule.sh
+++ b/t/t6041-bisect-submodule.sh
@@ -8,7 +8,7 @@ test_description='bisect can handle submodules'
git_bisect () {
git status -su >expect &&
ls -1pR * >>expect &&
- tar cf "$TRASH_DIRECTORY/tmp.tar" * &&
+ "$TAR" cf "$TRASH_DIRECTORY/tmp.tar" * &&
GOOD=$(git rev-parse --verify HEAD) &&
may_only_be_test_must_fail "$2" &&
$2 git checkout "$1" &&
@@ -25,7 +25,7 @@ git_bisect () {
git bisect start &&
git bisect good $GOOD &&
rm -rf * &&
- tar xf "$TRASH_DIRECTORY/tmp.tar" &&
+ "$TAR" xf "$TRASH_DIRECTORY/tmp.tar" &&
git status -su >actual &&
ls -1pR * >>actual &&
test_cmp expect actual &&