From: Ævar Arnfjörð Bjarmason Date: Sun, 8 Aug 2010 14:49:26 +0000 (+0000) Subject: t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh X-Git-Tag: v1.7.3-rc0~2^2~42 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4678a5cd71312f27b77228ddc398a6f0fa2e88a0;p=git.git t/Makefile: Can't include GIT-BUILD-OPTIONS, it's a .sh Change the smoke testing portion of t/Makefile not to include GIT-BUILD-OPTIONS. It's a shellscript, not a Makefile snippet, so it had the nasty side-effect of sneaking e.g. SHELL_PATH = '/bin/sh' (with quotes) everywhere. Just add our own PERL_PATH variable as a workaround. The t/Makefile already has e.g. an equivalent SHELL_PATH and TAR option which duplicate the definitions in GIT-BUILD-OPTIONS. Reported-by: Thomas Rast Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/t/Makefile b/t/Makefile index d8bf05ff6..00f64820c 100644 --- a/t/Makefile +++ b/t/Makefile @@ -8,6 +8,7 @@ #GIT_TEST_OPTS=--verbose --debug SHELL_PATH ?= $(SHELL) +PERL_PATH ?= /usr/bin/perl TAR ?= $(TAR) RM ?= rm -f @@ -50,7 +51,6 @@ valgrind: GIT_TEST_OPTS=--valgrind $(MAKE) # Smoke testing targets --include ../GIT-BUILD-OPTIONS -include ../GIT-VERSION-FILE uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo unknown') uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo unknown')