diff options
| author | Jeff King <peff@peff.net> | 2009-08-09 04:38:11 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-08-09 10:49:34 -0700 |
| commit | 91c8b825ce2a301e9861be60c3d7853fefa93c04 (patch) | |
| tree | 4327e255850c62f711c4e0dd62b2818f8090c3a1 | |
| parent | eaf0551d56b4fd3a97c8d0f5ded1ea6e891f9005 (diff) | |
| download | git-91c8b825ce2a301e9861be60c3d7853fefa93c04.tar.gz git-91c8b825ce2a301e9861be60c3d7853fefa93c04.tar.xz | |
tests: provide $TRASH_DIRECTORY variable
Most scripts don't care about the absolute path to the trash
directory. The one exception was t4014 script, which pieced
together $TEST_DIRECTORY and $test itself to get an absolute
directory.
Instead, let's provide a $TRASH_DIRECTORY which specifies
the same thing. This keeps the $test variable internal to
test-lib.sh and paves the way for trash directories in other
locations.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | t/t4014-format-patch.sh | 3 | ||||
| -rw-r--r-- | t/test-lib.sh | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh index 922a8941e..531f5b795 100755 --- a/t/t4014-format-patch.sh +++ b/t/t4014-format-patch.sh @@ -493,13 +493,12 @@ test_expect_success 'format-patch from a subdirectory (2)' ' ' test_expect_success 'format-patch from a subdirectory (3)' ' - here="$TEST_DIRECTORY/$test" && rm -f 0* && filename=$( rm -rf sub && mkdir -p sub/dir && cd sub/dir && - git format-patch -1 -o "$here" + git format-patch -1 -o "$TRASH_DIRECTORY" ) && basename=$(expr "$filename" : ".*/\(.*\)") && test -f "$basename" diff --git a/t/test-lib.sh b/t/test-lib.sh index 5fdc5d94a..e6a7bb1b4 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -645,7 +645,8 @@ fi # Test repository test="trash directory.$(basename "$0" .sh)" -test ! -z "$debug" || remove_trash="$TEST_DIRECTORY/$test" +TRASH_DIRECTORY="$TEST_DIRECTORY/$test" +test ! -z "$debug" || remove_trash=$TRASH_DIRECTORY rm -fr "$test" || { GIT_EXIT_OK=t echo >&5 "FATAL: Cannot prepare test area" |