diff options
author | Junio C Hamano <gitster@pobox.com> | 2012-09-29 22:27:56 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2012-09-29 22:27:56 -0700 |
commit | a275e823aceff5ddb5a49d4bfd1a0e96da312597 (patch) | |
tree | eb295f8afc1449d21ace01d637fffa53e188b9f3 /t | |
parent | 652398a88e7c3d18b6820a2ae369b05d26dc757f (diff) | |
parent | 4cde519fe666af478be4b86659c518949a853f91 (diff) | |
download | git-a275e823aceff5ddb5a49d4bfd1a0e96da312597.tar.gz git-a275e823aceff5ddb5a49d4bfd1a0e96da312597.tar.xz |
Merge branch 'rr/test-use-shell-path-not-shell'
Fixes a brown-paper bag bug.
* rr/test-use-shell-path-not-shell:
test-lib: use $SHELL_PATH, not $SHELL
Diffstat (limited to 't')
-rw-r--r-- | t/test-lib.sh | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index bff3d7570..bfc223815 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -15,22 +15,6 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see http://www.gnu.org/licenses/ . -# if --tee was passed, write the output not only to the terminal, but -# additionally to the file test-results/$BASENAME.out, too. -case "$GIT_TEST_TEE_STARTED, $* " in -done,*) - # do not redirect again - ;; -*' --tee '*|*' --va'*) - mkdir -p test-results - BASE=test-results/$(basename "$0" .sh) - (GIT_TEST_TEE_STARTED=done ${SHELL-sh} "$0" "$@" 2>&1; - echo $? > $BASE.exit) | tee $BASE.out - test "$(cat $BASE.exit)" = 0 - exit - ;; -esac - # Keep the original TERM for say_color ORIGINAL_TERM=$TERM @@ -63,6 +47,22 @@ fi . "$GIT_BUILD_DIR"/GIT-BUILD-OPTIONS export PERL_PATH SHELL_PATH +# if --tee was passed, write the output not only to the terminal, but +# additionally to the file test-results/$BASENAME.out, too. +case "$GIT_TEST_TEE_STARTED, $* " in +done,*) + # do not redirect again + ;; +*' --tee '*|*' --va'*) + mkdir -p test-results + BASE=test-results/$(basename "$0" .sh) + (GIT_TEST_TEE_STARTED=done ${SHELL_PATH} "$0" "$@" 2>&1; + echo $? > $BASE.exit) | tee $BASE.out + test "$(cat $BASE.exit)" = 0 + exit + ;; +esac + # For repeatability, reset the environment to known value. LANG=C LC_ALL=C |