diff options
| author | Jeff King <peff@peff.net> | 2009-10-30 16:10:17 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-10-30 15:03:10 -0700 |
| commit | 15c6bf0df4d9f060b5cae7a9a899dc3601c54353 (patch) | |
| tree | ee1ef3978e4c1e220defa7c09284f271a02b28f8 | |
| parent | ab3d175f87767c377cd65a06d96c50a316a28e30 (diff) | |
| download | git-15c6bf0df4d9f060b5cae7a9a899dc3601c54353.tar.gz git-15c6bf0df4d9f060b5cae7a9a899dc3601c54353.tar.xz | |
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>
| -rwxr-xr-x | t/t9150-svk-mergetickets.sh | 3 | ||||
| -rwxr-xr-x | t/t9151-svn-mergeinfo.sh | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/t/t9150-svk-mergetickets.sh b/t/t9150-svk-mergetickets.sh index 8000c347b..dd0c2bad2 100755 --- 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' " - 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 diff --git a/t/t9151-svn-mergeinfo.sh b/t/t9151-svn-mergeinfo.sh index 7eb36e599..9bee51635 100755 --- 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' " - 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 |