test-lib: use DIFF definition from GIT-BUILD-OPTIONS
Otherwise running individual tests from t/ directory may lack the definition of $DIFF, $GIT_TEST_CMP and friends. Noticed and initial patch provided by Thomas Rast, alternative solution suggested by Brandon Casey, which this patch implements. Signed-off-by: Junio C Hamano <gitster@pobox.com> Acked-by: Thomas Rast <trast@student.ethz.ch>
Junio C Hamano committed
Jun 11, 2010 at 09:40 UTC
5e87eae97df69a48a575fd79131e85067f9dbf13
2 files changed
+16
-10
Makefile
+6
@@ -1944,6 +1944,12 @@ GIT-BUILD-OPTIONS: FORCE
1944
@echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@
1945
@echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@
1946
@echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@
1947
+ifdef GIT_TEST_CMP
1948
+ @echo GIT_TEST_CMP=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_CMP)))'\' >>$@
1949
+endif
1950
+ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT
1951
+ @echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@
1952
+endif
1953
1954
### Detect Tck/Tk interpreter path changes
1955
ifndef NO_TCLTK
t/test-lib.sh
+10
-10
@@ -64,16 +64,6 @@ export GIT_AUTHOR_EMAIL GIT_AUTHOR_NAME
64
export GIT_COMMITTER_EMAIL GIT_COMMITTER_NAME
65
export EDITOR
66
67
-if test -z "$GIT_TEST_CMP"
68
-then
69
- if test -n "$GIT_TEST_CMP_USE_COPIED_CONTEXT"
70
- then
71
- GIT_TEST_CMP="$DIFF -c"
72
- else
73
- GIT_TEST_CMP="$DIFF -u"
74
- fi
75
-fi
76
-
67
# Protect ourselves from common misconfiguration to export
68
# CDPATH into the environment
69
unset CDPATH
@@ -691,6 +681,16 @@ export PATH GIT_EXEC_PATH GIT_TEMPLATE_DIR GIT_CONFIG_NOSYSTEM GIT_CONFIG_NOGLOB
681
682
. ../GIT-BUILD-OPTIONS
683
684
+if test -z "$GIT_TEST_CMP"
685
+then
686
+ if test -n "$GIT_TEST_CMP_USE_COPIED_CONTEXT"
687
+ then
688
+ GIT_TEST_CMP="$DIFF -c"
689
+ else
690
+ GIT_TEST_CMP="$DIFF -u"
691
+ fi
692
+fi
693
+
694
GITPERLLIB=$(pwd)/../perl/blib/lib:$(pwd)/../perl/blib/arch/auto/Git
695
export GITPERLLIB
696
test -d ../templates/blt || {