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>
Jeff King committed
Oct 30, 2009 at 16:10 UTC
15c6bf0df4d9f060b5cae7a9a899dc3601c54353
2 files changed
+4
-2
t/t9150-svk-mergetickets.sh
+2
-1
@@ -8,7 +8,8 @@ test_description='git-svn svk merge tickets'
8
. ./lib-git-svn.sh
9
10
test_expect_success 'load svk depot' "
11
- svnadmin load -q '$rawsvnrepo' < '../t9150/svk-merge.dump' &&
11
+ svnadmin load -q '$rawsvnrepo' \
12
+ < '$TEST_DIRECTORY/t9150/svk-merge.dump' &&
13
git svn init --minimize-url -R svkmerge \
14
-T trunk -b branches '$svnrepo' &&
15
git svn fetch --all
t/t9151-svn-mergeinfo.sh
+2
-1
@@ -8,7 +8,8 @@ test_description='git-svn svn mergeinfo properties'
8
. ./lib-git-svn.sh
9
10
test_expect_success 'load svn dump' "
11
- svnadmin load -q '$rawsvnrepo' < '../t9151/svn-mergeinfo.dump' &&
11
+ svnadmin load -q '$rawsvnrepo' \
12
+ < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
13
git svn init --minimize-url -R svnmerge \
14
-T trunk -b branches '$svnrepo' &&
15
git svn fetch --all