diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-06-11 16:40:25 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-06-11 20:45:05 (GMT) |
| commit | 5e87eae97df69a48a575fd79131e85067f9dbf13 (patch) | |
| tree | c394c8e9a152e1f26a5fead39e2b8f0ef54b6b5d /Makefile | |
| parent | 09ce4bb6ea7c06c1de82f042cb3ade622b0fa36c (diff) | |
| download | git-5e87eae97df69a48a575fd79131e85067f9dbf13.zip git-5e87eae97df69a48a575fd79131e85067f9dbf13.tar.gz git-5e87eae97df69a48a575fd79131e85067f9dbf13.tar.bz2 | |
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>
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1944,6 +1944,12 @@ GIT-BUILD-OPTIONS: FORCE @echo NO_CURL=\''$(subst ','\'',$(subst ','\'',$(NO_CURL)))'\' >>$@ @echo NO_PERL=\''$(subst ','\'',$(subst ','\'',$(NO_PERL)))'\' >>$@ @echo NO_PYTHON=\''$(subst ','\'',$(subst ','\'',$(NO_PYTHON)))'\' >>$@ +ifdef GIT_TEST_CMP + @echo GIT_TEST_CMP=\''$(subst ','\'',$(subst ','\'',$(GIT_TEST_CMP)))'\' >>$@ +endif +ifdef GIT_TEST_CMP_USE_COPIED_CONTEXT + @echo GIT_TEST_CMP_USE_COPIED_CONTEXT=YesPlease >>$@ +endif ### Detect Tck/Tk interpreter path changes ifndef NO_TCLTK |