зеркало из https://github.com/microsoft/git.git
test-lib: Allow overriding of TEST_DIRECTORY
Tests that test the test-lib.sh itself need to be executed in the dynamically created trash directory, so we can't assume $TEST_DIRECTORY is ../ for those. As a side benefit this change also makes it easy for us to move the t/*.sh tests into subdirectories if we ever want to do that. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Родитель
6cec5c6835
Коммит
62f539043c
|
@ -710,7 +710,13 @@ test_done () {
|
||||||
|
|
||||||
# Test the binaries we have just built. The tests are kept in
|
# Test the binaries we have just built. The tests are kept in
|
||||||
# t/ subdirectory and are run in 'trash directory' subdirectory.
|
# t/ subdirectory and are run in 'trash directory' subdirectory.
|
||||||
TEST_DIRECTORY=$(pwd)
|
if test -z "$TEST_DIRECTORY"
|
||||||
|
then
|
||||||
|
# We allow tests to override this, in case they want to run tests
|
||||||
|
# outside of t/, e.g. for running tests on the test library
|
||||||
|
# itself.
|
||||||
|
TEST_DIRECTORY=$(pwd)
|
||||||
|
fi
|
||||||
GIT_BUILD_DIR="$TEST_DIRECTORY"/..
|
GIT_BUILD_DIR="$TEST_DIRECTORY"/..
|
||||||
|
|
||||||
if test -n "$valgrind"
|
if test -n "$valgrind"
|
||||||
|
|
Загрузка…
Ссылка в новой задаче