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 <trast@student.ethz.ch> Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Aug 8, 2010 at 14:49 UTC
4678a5cd71312f27b77228ddc398a6f0fa2e88a0
1 file changed
+1
-1
t/Makefile
+1
-1
@@ -8,6 +8,7 @@
8
9
#GIT_TEST_OPTS=--verbose --debug
10
SHELL_PATH ?= $(SHELL)
11
+PERL_PATH ?= /usr/bin/perl
12
TAR ?= $(TAR)
13
RM ?= rm -f
14
@@ -50,7 +51,6 @@ valgrind:
51
GIT_TEST_OPTS=--valgrind $(MAKE)
52
53
# Smoke testing targets
53
--include ../GIT-BUILD-OPTIONS
54
-include ../GIT-VERSION-FILE
55
uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo unknown')
56
uname_M := $(shell sh -c 'uname -m 2>/dev/null || echo unknown')