mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
This dot-sources GIT-BUILD-OPTIONS a lot earlier in test-lib.sh so that its use of "perl" can use "$PERL_PATH" to choose the version of Perl the user told us is suitable for our use. This is iffy; I didn't check it very carefully, and I would not be surprised if there are subtle breakages. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
ad78585eee
commit
3c8f12c96c
|
@ -34,6 +34,26 @@ esac
|
|||
# Keep the original TERM for say_color
|
||||
ORIGINAL_TERM=$TERM
|
||||
|
||||
# Test the binaries we have just built. The tests are kept in
|
||||
# t/ subdirectory and are run in 'trash directory' subdirectory.
|
||||
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
|
||||
if test -z "$TEST_OUTPUT_DIRECTORY"
|
||||
then
|
||||
# Similarly, override this to store the test-results subdir
|
||||
# elsewhere
|
||||
TEST_OUTPUT_DIRECTORY=$TEST_DIRECTORY
|
||||
fi
|
||||
GIT_BUILD_DIR="$TEST_DIRECTORY"/..
|
||||
|
||||
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
|
||||
export PERL_PATH SHELL_PATH
|
||||
|
||||
# For repeatability, reset the environment to known value.
|
||||
LANG=C
|
||||
LC_ALL=C
|
||||
|
@ -46,7 +66,7 @@ EDITOR=:
|
|||
# /usr/xpg4/bin/sh and /bin/ksh to bail out. So keep the unsets
|
||||
# deriving from the command substitution clustered with the other
|
||||
# ones.
|
||||
unset VISUAL EMAIL LANGUAGE COLUMNS $(perl -e '
|
||||
unset VISUAL EMAIL LANGUAGE COLUMNS $("$PERL_PATH" -e '
|
||||
my @env = keys %ENV;
|
||||
my $ok = join("|", qw(
|
||||
TRACE
|
||||
|
@ -229,7 +249,7 @@ trap 'die' EXIT
|
|||
|
||||
# The user-facing functions are loaded from a separate file so that
|
||||
# test_perf subshells can have them too
|
||||
. "${TEST_DIRECTORY:-.}"/test-lib-functions.sh
|
||||
. "$TEST_DIRECTORY/test-lib-functions.sh"
|
||||
|
||||
# You are not expected to call test_ok_ and test_failure_ directly, use
|
||||
# the text_expect_* functions instead.
|
||||
|
@ -380,23 +400,6 @@ test_done () {
|
|||
esac
|
||||
}
|
||||
|
||||
# Test the binaries we have just built. The tests are kept in
|
||||
# t/ subdirectory and are run in 'trash directory' subdirectory.
|
||||
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
|
||||
if test -z "$TEST_OUTPUT_DIRECTORY"
|
||||
then
|
||||
# Similarly, override this to store the test-results subdir
|
||||
# elsewhere
|
||||
TEST_OUTPUT_DIRECTORY=$TEST_DIRECTORY
|
||||
fi
|
||||
GIT_BUILD_DIR="$TEST_DIRECTORY"/..
|
||||
|
||||
if test -n "$valgrind"
|
||||
then
|
||||
make_symlink () {
|
||||
|
@ -492,10 +495,6 @@ GIT_CONFIG_NOSYSTEM=1
|
|||
GIT_ATTR_NOSYSTEM=1
|
||||
export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_ATTR_NOSYSTEM
|
||||
|
||||
. "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS
|
||||
|
||||
export PERL_PATH
|
||||
|
||||
if test -z "$GIT_TEST_CMP"
|
||||
then
|
||||
if test -n "$GIT_TEST_CMP_USE_COPIED_CONTEXT"
|
||||
|
|
Loading…
Reference in a new issue