Skip to content

Commit

Permalink
t915{0,1}: use $TEST_DIRECTORY
Browse files Browse the repository at this point in the history
Because --root can put our trash directories elsewhere,
using ".." may not always work.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Jeff King authored and Junio C Hamano committed Oct 30, 2009
1 parent ab3d175 commit 15c6bf0
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion t/t9150-svk-mergetickets.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ test_description='git-svn svk merge tickets'
. ./lib-git-svn.sh

test_expect_success 'load svk depot' "
svnadmin load -q '$rawsvnrepo' < '../t9150/svk-merge.dump' &&
svnadmin load -q '$rawsvnrepo' \
< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
git svn init --minimize-url -R svkmerge \
-T trunk -b branches '$svnrepo' &&
git svn fetch --all
Expand Down
3 changes: 2 additions & 1 deletion t/t9151-svn-mergeinfo.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ test_description='git-svn svn mergeinfo properties'
. ./lib-git-svn.sh

test_expect_success 'load svn dump' "
svnadmin load -q '$rawsvnrepo' < '../t9151/svn-mergeinfo.dump' &&
svnadmin load -q '$rawsvnrepo' \
< '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
git svn init --minimize-url -R svnmerge \
-T trunk -b branches '$svnrepo' &&
git svn fetch --all
Expand Down

0 comments on commit 15c6bf0

Please sign in to comment.