diff options
| author | Jeff King <peff@peff.net> | 2009-08-09 04:37:52 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-09 10:48:39 -0700 |
| commit | eaf0551d56b4fd3a97c8d0f5ded1ea6e891f9005 (patch) | |
| tree | faeef5892e8554b8865fef3a19f1155633c52083 /t | |
| parent | d82e75e86c8d1555aaa6415034aff215633fe7f2 (diff) | |
| download | git-eaf0551d56b4fd3a97c8d0f5ded1ea6e891f9005.tar.gz git-eaf0551d56b4fd3a97c8d0f5ded1ea6e891f9005.tar.xz | |
tests: use "$TEST_DIRECTORY" instead of ".."
The $TEST_DIRECTORY variable allows tests to find the
top-level test directory regardless of the current working
directory.
In the past, this has been used to accomodate tests which
change directories, but it is also the first step to being
able to move trash directories outside of the
$TEST_DIRECTORY hierarchy.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rwxr-xr-x | t/t3404-rebase-interactive.sh | 2 | ||||
| -rwxr-xr-x | t/t3411-rebase-preserve-around-merges.sh | 2 | ||||
| -rwxr-xr-x | t/t3414-rebase-preserve-onto.sh | 2 | ||||
| -rwxr-xr-x | t/t4020-diff-external.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh index a973628e8..4cae01952 100755 --- a/t/t3404-rebase-interactive.sh +++ b/t/t3404-rebase-interactive.sh @@ -10,7 +10,7 @@ that the result still makes sense. ' . ./test-lib.sh -. ../lib-rebase.sh +. "$TEST_DIRECTORY"/lib-rebase.sh set_fake_editor diff --git a/t/t3411-rebase-preserve-around-merges.sh b/t/t3411-rebase-preserve-around-merges.sh index 653350521..14a23cd87 100755 --- a/t/t3411-rebase-preserve-around-merges.sh +++ b/t/t3411-rebase-preserve-around-merges.sh @@ -10,7 +10,7 @@ a merge to before the merge. ' . ./test-lib.sh -. ../lib-rebase.sh +. "$TEST_DIRECTORY"/lib-rebase.sh set_fake_editor diff --git a/t/t3414-rebase-preserve-onto.sh b/t/t3414-rebase-preserve-onto.sh index 80019ee07..ee0a6cccf 100755 --- a/t/t3414-rebase-preserve-onto.sh +++ b/t/t3414-rebase-preserve-onto.sh @@ -10,7 +10,7 @@ aren'"'"'t on top of $ONTO, even if they are on top of $UPSTREAM. ' . ./test-lib.sh -. ../lib-rebase.sh +. "$TEST_DIRECTORY"/lib-rebase.sh # Set up branches like this: # A1---B1---E1---F1---G1 diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index 4ea42e00d..a7602cf92 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -166,7 +166,7 @@ test_expect_success 'diff --cached' ' git update-index --assume-unchanged file && echo second >file && git diff --cached >actual && - test_cmp ../t4020/diff.NUL actual + test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual ' test_done |