use build-time SHELL_PATH in test scripts

The top-level Makefile now creates a GIT-BUILD-OPTIONS file
which stores any options selected by the make process that
may be of use to further parts of the build process.
Specifically, we store the SHELL_PATH so that it can be used
by tests to construct shell scripts on the fly.

The format of the GIT-BUILD-OPTIONS file is Bourne shell,
and it is sourced by test-lib.sh; all tests can rely on just
having $SHELL_PATH correctly set in the environment.

The GIT-BUILD-OPTIONS file is written every time the
toplevel 'make' is invoked. Since the only users right now
are the test scripts, there's no drawback to updating its
timestamp. If something build-related depends on this, we
can do a trick similar to the one used by GIT-CFLAGS.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/.gitignore b/.gitignore
index 165b256e2e81ef36ca6b8f9dd8db8d0cc4f164d4..4ff2fec2785d21055bdcb5d9661d5090624b92da 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+GIT-BUILD-OPTIONS

 GIT-CFLAGS
 GIT-GUI-VARS
 GIT-VERSION-FILE
 GIT-CFLAGS
 GIT-GUI-VARS
 GIT-VERSION-FILE

diff --git a/Makefile b/Makefile
index a5b6eebf1a0b65b481f6dd8f1e38006b46e87c83..c2f84a76f62171fe32ffe1770a10721f516f8169 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -812,7 +812,7 @@ export TAR INSTALL DESTDIR SHELL_PATH
 
 ### Build rules
 
 
 ### Build rules
 

-all:: $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS)
+all:: $(ALL_PROGRAMS) $(BUILT_INS) $(OTHER_PROGRAMS) GIT-BUILD-OPTIONS

 ifneq (,$X)
        $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$p';)
 endif
 ifneq (,$X)
        $(foreach p,$(patsubst %$X,%,$(filter %$X,$(ALL_PROGRAMS) $(BUILT_INS) git$X)), $(RM) '$p';)
 endif


@@ -1011,6 +1011,9 @@ GIT-CFLAGS: .FORCE-GIT-CFLAGS
                echo "$$FLAGS" >GIT-CFLAGS; \
             fi
 
                echo "$$FLAGS" >GIT-CFLAGS; \
             fi
 

+GIT-BUILD-OPTIONS: .FORCE-GIT-BUILD-OPTIONS
+       @echo SHELL_PATH=\''$(SHELL_PATH_SQ)'\' >$@
+

 ### Detect Tck/Tk interpreter path changes
 ifndef NO_TCLTK
 TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')
 ### Detect Tck/Tk interpreter path changes
 ifndef NO_TCLTK
 TRACK_VARS = $(subst ','\'',-DTCLTK_PATH='$(TCLTK_PATH_SQ)')


@@ -1166,10 +1169,11 @@ ifndef NO_TCLTK
        $(MAKE) -C gitk-git clean
        $(MAKE) -C git-gui clean
 endif
        $(MAKE) -C gitk-git clean
        $(MAKE) -C git-gui clean
 endif

-       $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS
+       $(RM) GIT-VERSION-FILE GIT-CFLAGS GIT-GUI-VARS GIT-BUILD-OPTIONS

 
 .PHONY: all install clean strip
 .PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS
 
 .PHONY: all install clean strip
 .PHONY: .FORCE-GIT-VERSION-FILE TAGS tags cscope .FORCE-GIT-CFLAGS

+.PHONY: .FORCE-GIT-BUILD-OPTIONS

 
 ### Check documentation
 #
 
 ### Check documentation
 #

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 62e65d704b37eb92509a8ad7e844cea8a675ed50..049aa375381b5929d1f35b7316c3fe6a647e4f93 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -61,7 +61,7 @@ test_expect_success 'setup' '
        git tag I
 '
 
        git tag I
 '
 

-echo "#!$SHELL" >fake-editor
+echo "#!$SHELL_PATH" >fake-editor.sh

 cat >> fake-editor.sh <<\EOF
 case "$1" in
 */COMMIT_EDITMSG)
 cat >> fake-editor.sh <<\EOF
 case "$1" in
 */COMMIT_EDITMSG)

diff --git a/t/test-lib.sh b/t/test-lib.sh
index 90df619b9f67374c76ec7506836b78bd2c264cc7..68efda44928fdd119a6e052557a9833cf3d2c13a 100644 (file)
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -359,6 +359,8 @@ if ! test -x ../test-chmtime; then
        exit 1
 fi
 
        exit 1
 fi
 

+. ../GIT-BUILD-OPTIONS
+

 # Test repository
 test=trash
 rm -fr "$test"
 # Test repository
 test=trash
 rm -fr "$test"