From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 25 Jul 2012 22:47:08 +0000 (-0700)
Subject: Merge branch 'jc/test-lib-source-build-options-early'
X-Git-Tag: v1.7.12-rc1~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/cdd159b2f56c9e69e37bbb8f5af301abd93e5407?ds=inline;hp=-c

Merge branch 'jc/test-lib-source-build-options-early'

Reorders t/test-lib.sh so that we dot-source GIT-BUILD-OPTIONS that
records the shell and Perl the user told us to use with Git a lot
early, so that test-lib.sh script itself can use "$PERL_PATH" in
one of its early operations.

* jc/test-lib-source-build-options-early:
test-lib: reorder and include GIT-BUILD-OPTIONS a lot earlier
---

cdd159b2f56c9e69e37bbb8f5af301abd93e5407
diff --combined t/test-lib.sh
index 5e7f435d51,f3e7cf9e57..bb4f8865b2
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@@ -34,6 -34,26 +34,26 @@@ esa
  # 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 +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
@@@ -61,7 -81,6 +81,7 @@@
  	my @vars = grep(/^GIT_/ && !/^GIT_($ok)/o, @env);
  	print join("\n", @vars);
  ')
 +unset XDG_CONFIG_HOME
  GIT_AUTHOR_EMAIL=author@example.com
  GIT_AUTHOR_NAME='A U Thor'
  GIT_COMMITTER_EMAIL=committer@example.com
@@@ -230,7 -249,7 +250,7 @@@ trap 'die' EXI
  
  # 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.
@@@ -381,23 -400,6 +401,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 () {
@@@ -493,10 -495,6 +496,6 @@@ GIT_CONFIG_NOSYSTEM=
  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"