aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-02-24 14:40:45 -0500
committerJunio C Hamano <gitster@pobox.com>2008-02-29 00:00:29 -0800
commit7cf7f54a65aa1c70e21fe73753f6b0671d129adf (patch)
treebbb7df1414195b9183c6084eabd9d48a4a07f9ca /t
parent75336878c795b746b1c67b736c96f5ef8a2b3f02 (diff)
downloadgit-7cf7f54a65aa1c70e21fe73753f6b0671d129adf.tar.gz
git-7cf7f54a65aa1c70e21fe73753f6b0671d129adf.tar.xz
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>
Diffstat (limited to 't')
-rwxr-xr-xt/t3404-rebase-interactive.sh2
-rw-r--r--t/test-lib.sh2
2 files changed, 3 insertions, 1 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index 62e65d704..049aa3753 100755
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -61,7 +61,7 @@ test_expect_success 'setup' '
git tag I
'
-echo "#!$SHELL" >fake-editor
+echo "#!$SHELL_PATH" >fake-editor.sh
cat >> fake-editor.sh <<\EOF
case "$1" in
*/COMMIT_EDITMSG)
diff --git a/t/test-lib.sh b/t/test-lib.sh
index 90df619b9..68efda449 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -359,6 +359,8 @@ if ! test -x ../test-chmtime; then
exit 1
fi
+. ../GIT-BUILD-OPTIONS
+
# Test repository
test=trash
rm -fr "$test"