From: Michael J Gruber Date: Tue, 21 Apr 2009 09:21:59 +0000 (+0200) Subject: test-lib.sh: Help test_create_repo() find the templates dir X-Git-Tag: v1.6.3-rc2~26 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3a0483281afbb6660aaf86c7b228a523782a4d6a;p=git.git test-lib.sh: Help test_create_repo() find the templates dir Currently, test_create_repo() expects that templates can be found below `pwd`/.. This assumption fails when tests are run against a git installed somewhere else or test_create_repo() is called from subdirectiories (several tests do this). Therefore, use $TEST_DIRECTORY as introduced in 2d84e9fb and expect templates to be present in $TEST_DIRECTORY/.. which should be the root dir of the git checkout. Signed-off-by: Michael J Gruber Signed-off-by: Junio C Hamano --- diff --git a/t/test-lib.sh b/t/test-lib.sh index 4bd986f43..dad1437fa 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -491,7 +491,7 @@ test_create_repo () { repo="$1" mkdir -p "$repo" cd "$repo" || error "Cannot setup test environment" - "$GIT_EXEC_PATH/git-init" "--template=$owd/../templates/blt/" >&3 2>&4 || + "$GIT_EXEC_PATH/git-init" "--template=$TEST_DIRECTORY/../templates/blt/" >&3 2>&4 || error "cannot run git init -- have you built things yet?" mv .git/hooks .git/hooks-disabled cd "$owd"