| Message ID | 2b04f9f086e0361345fb38effd61a4b1ef4ac22d.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> > > We really need to be able to find the test helpers... Really. This > change was forgotten when we moved the test helpers into t/helper/ Yeah, it is unfortunate that more and more things have internal whitebox test that can only be checked with test-helper binaries, which makes it impossible to fully testing installed git, but that is not a new issue this fix introduces. This at least allows us to keep using the test-helpers from freshly built Git while using the installed version of Git for most of the tests. Thanks. > Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> > --- > t/test-lib.sh | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/t/test-lib.sh b/t/test-lib.sh > index 47a99aa0ed..832ede5099 100644 > --- a/t/test-lib.sh > +++ b/t/test-lib.sh > @@ -957,7 +957,7 @@ elif test -n "$GIT_TEST_INSTALLED" > then > GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) || > error "Cannot run git from $GIT_TEST_INSTALLED." > - PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH > + PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH > GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} > else # normal case, use ../bin-wrappers only unless $with_dashes: > git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"
diff --git a/t/test-lib.sh b/t/test-lib.sh index 47a99aa0ed..832ede5099 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -957,7 +957,7 @@ elif test -n "$GIT_TEST_INSTALLED" then GIT_EXEC_PATH=$($GIT_TEST_INSTALLED/git --exec-path) || error "Cannot run git from $GIT_TEST_INSTALLED." - PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR:$PATH + PATH=$GIT_TEST_INSTALLED:$GIT_BUILD_DIR/t/helper:$PATH GIT_EXEC_PATH=${GIT_TEST_EXEC_PATH:-$GIT_EXEC_PATH} else # normal case, use ../bin-wrappers only unless $with_dashes: git_bin_dir="$GIT_BUILD_DIR/bin-wrappers"