From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Tue, 3 Feb 2009 23:26:31 +0000 (+0100)
Subject: test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH
X-Git-Tag: v1.6.3-rc0~217^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=a6d63b749369f3ba9c6d2f382efd27838604b7db;p=git.git

test-lib: avoid assuming that templates/ are in the GIT_EXEC_PATH

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/test-lib.sh b/t/test-lib.sh
index bc87936ba..20214468a 100644
--- a/t/test-lib.sh
+++ b/t/test-lib.sh
@@ -454,7 +454,7 @@ test_create_repo () {
 	repo="$1"
 	mkdir -p "$repo"
 	cd "$repo" || error "Cannot setup test environment"
-	"$GIT_EXEC_PATH/git" init "--template=$GIT_EXEC_PATH/templates/blt/" >&3 2>&4 ||
+	"$GIT_EXEC_PATH/git" init "--template=$owd/../templates/blt/" >&3 2>&4 ||
 	error "cannot run git init -- have you built things yet?"
 	mv .git/hooks .git/hooks-disabled
 	cd "$owd"
@@ -578,8 +578,6 @@ else
 	PATH=$GIT_VALGRIND/bin:$PATH
 	GIT_EXEC_PATH=$GIT_VALGRIND/bin
 	export GIT_VALGRIND
-
-	make_symlink ../../../templates "$GIT_VALGRIND"/bin/templates || exit
 fi
 GIT_TEMPLATE_DIR=$(pwd)/../templates/blt
 unset GIT_CONFIG