[RFC PATCH] tests: fix PATH for GIT_TEST_INSTALLED tests
- From
- Guillaume Maudoux <layus.on@gmail.com>
- Date
- Apr 14, 2018, 00:33 UTC
- Message-ID
- <20180414003338.27091-1-layus.on@gail.com>
From: Guillaume Maudoux <layus.on@gmail.com>
When running tests on an existing git installation with GIT_TEST_INSTALLED (as described in t/README), the test helpers are missing in the PATH.
This fixes the test suite in a way that allows all the tests to pass.
Signed-off-by: Guillaume Maudoux <layus.on@gmail.com> ---
This is more a bug report than a real patch. The issue is described above and this patch does solve it. I however think that someone with more knowledge should refactor all that chunck of code that was last changed in 2010.
In particular, it seems that the GIT_TEST_INSTALLED path does not use bin-wrappers at all. This may imply that --with-dashes also breaks tests.
t/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git t/test-lib.sh t/test-lib.sh index 7740d511d..0d51261f7 100644 --- t/test-lib.sh +++ t/test-lib.sh @@ -923,7 +923,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:$GIT_BUILD_DIR:$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"
-- 2.17.0