diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2010-08-08 14:49:26 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-18 12:42:14 -0700 |
| commit | 4678a5cd71312f27b77228ddc398a6f0fa2e88a0 (patch) | |
| tree | abc68f439cd7786b066cc5a05f785cf2a1717ea0 /t/Makefile | |
| parent | d15e9ebc5c8a627844275e02a2b15a101ce46d4a (diff) | |
| download | git-4678a5cd71312f27b77228ddc398a6f0fa2e88a0.tar.gz git-4678a5cd71312f27b77228ddc398a6f0fa2e88a0.tar.xz | |
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>
Diffstat (limited to 't/Makefile')
| -rw-r--r-- | t/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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') |