| Message ID | eddea552e414964e19413c02fb07167432e8aaa0.1542030510.git.gitgitgadget@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | tests: various improvements to the GIT_TEST_INSTALLED feature | expand |
"Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com> writes: > From: Johannes Schindelin <johannes.schindelin@gmx.de> > > 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> > --- Yup. Makes sense. > t/lib-gettext.sh | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > 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
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