Merge branch 'js/test-git-installed'
authorJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2018 07:24:41 +0000 (16:24 +0900)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Nov 2018 07:24:41 +0000 (16:24 +0900)
Update the "test installed Git" mode of our test suite to work better.

* js/test-git-installed:
  tests: explicitly use `git.exe` on Windows
  tests: do not require Git to be built when testing an installed Git
  t/lib-gettext: test installed git-sh-i18n if GIT_TEST_INSTALLED is set
  tests: respect GIT_TEST_INSTALLED when initializing repositories
  tests: fix GIT_TEST_INSTALLED's PATH to include t/helper/

1  2 
Makefile
t/lib-gettext.sh
t/test-lib-functions.sh
t/test-lib.sh

diff --cc Makefile
Simple merge
@@@ -10,9 -10,14 +10,14 @@@ GIT_TEXTDOMAINDIR="$GIT_BUILD_DIR/po/bu
  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
 +if test_have_prereq GETTEXT && test_have_prereq C_LOCALE_OUTPUT
  then
        # is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian
        is_IS_locale=$(locale -a 2>/dev/null |
Simple merge
diff --cc t/test-lib.sh
Simple merge