t915{0,1}: use $TEST_DIRECTORY
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>
This commit is contained in:
parent
ab3d175f87
commit
15c6bf0df4
@ -8,7 +8,8 @@ test_description='git-svn svk merge tickets'
|
|||||||
. ./lib-git-svn.sh
|
. ./lib-git-svn.sh
|
||||||
|
|
||||||
test_expect_success 'load svk depot' "
|
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 \
|
git svn init --minimize-url -R svkmerge \
|
||||||
-T trunk -b branches '$svnrepo' &&
|
-T trunk -b branches '$svnrepo' &&
|
||||||
git svn fetch --all
|
git svn fetch --all
|
||||||
|
@ -8,7 +8,8 @@ test_description='git-svn svn mergeinfo properties'
|
|||||||
. ./lib-git-svn.sh
|
. ./lib-git-svn.sh
|
||||||
|
|
||||||
test_expect_success 'load svn dump' "
|
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 \
|
git svn init --minimize-url -R svnmerge \
|
||||||
-T trunk -b branches '$svnrepo' &&
|
-T trunk -b branches '$svnrepo' &&
|
||||||
git svn fetch --all
|
git svn fetch --all
|
||||||
|
Loading…
Reference in New Issue
Block a user