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>

diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh
index 8000c347b4c78c83d87c4f41dc6f08680fc23765..dd0c2bad24db26abdab7a91acee109978421ea3e 100755 (executable)
--- a/t/t9150-svk-mergetickets.sh
+++ b/t/t9150-svk-mergetickets.sh
@@ -8,7 +8,8 @@ test_description='git-svn svk merge tickets'
 . ./lib-git-svn.sh
 
 test_expect_success 'load svk depot' "
 . ./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
        git svn init --minimize-url -R svkmerge \
          -T trunk -b branches '$svnrepo' &&
        git svn fetch --all

diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh
index 7eb36e599ce8083f7dccb31a1bdd66c14837995e..9bee516358bd98d1b5c701f6aa0c4f3e4d95bd45 100755 (executable)
--- a/t/t9151-svn-mergeinfo.sh
+++ b/t/t9151-svn-mergeinfo.sh
@@ -8,7 +8,8 @@ test_description='git-svn svn mergeinfo properties'
 . ./lib-git-svn.sh
 
 test_expect_success 'load svn dump' "
 . ./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
        git svn init --minimize-url -R svnmerge \
          -T trunk -b branches '$svnrepo' &&
        git svn fetch --all