summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2018-11-12 05:48:36 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-14 13:50:21 +0900
commit875bf17e39f1651550d6c620c7e74d6e1d967641 (patch)
treeee3cc171d63108f8a5a14466d3ac2e396cf6eed1
parenttests: respect GIT_TEST_INSTALLED when initializing repositories (diff)
downloadtgif-875bf17e39f1651550d6c620c7e74d6e1d967641.tar.xz
t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set
It makes very, very little sense to test the built git-sh-i18n when the user asked specifically to test another one. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--t/lib-gettext.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/t/lib-gettext.sh b/t/lib-gettext.sh
index eec757f104..9eb160c997 100644
--- a/t/lib-gettext.sh
+++ b/t/lib-gettext.sh
@@ -10,7 +10,12 @@ GIT_TEXTDOMAINDIR="$GIT_BUILD_DIR/po/build/locale"
GIT_PO_PATH="$GIT_BUILD_DIR/po"
export GIT_TEXTDOMAINDIR GIT_PO_PATH
-. "$GIT_BUILD_DIR"/git-sh-i18n
+if test -n "$GIT_TEST_INSTALLED"
+then
+ . "$(git --exec-path)"/git-sh-i18n
+else
+ . "$GIT_BUILD_DIR"/git-sh-i18n
+fi
if test_have_prereq GETTEXT && ! test_have_prereq GETTEXT_POISON
then