undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tests: provide $TRASH_DIRECTORY variable

Browse Source 
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>
This commit is contained in:
Jeff King 2009-08-09 04:38:11 -04:00 committed by Junio C Hamano
parent eaf0551d56
commit 91c8b825ce
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
t/t4014-format-patch.sh
View File

@ -493,13 +493,12 @@ test_expect_success 'format-patch from a subdirectory (2)' '
' '
test_expect_success 'format-patch from a subdirectory (3)' ' test_expect_success 'format-patch from a subdirectory (3)' '
here="$TEST_DIRECTORY/$test" &&
rm -f 0* && rm -f 0* &&
filename=$( filename=$(
rm -rf sub && rm -rf sub &&
mkdir -p sub/dir && mkdir -p sub/dir &&
cd sub/dir && cd sub/dir &&
git format-patch -1 -o "$here" git format-patch -1 -o "$TRASH_DIRECTORY"
) && ) &&
basename=$(expr "$filename" : ".*/\(.*\)") && basename=$(expr "$filename" : ".*/\(.*\)") &&
test -f "$basename" test -f "$basename"

3
t/test-lib.sh
View File

@ -645,7 +645,8 @@ fi
# Test repository # Test repository
test="trash directory.$(basename "$0" .sh)" 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" || { rm -fr "$test" || {
GIT_EXIT_OK=t GIT_EXIT_OK=t
echo >&5 "FATAL: Cannot prepare test area" echo >&5 "FATAL: Cannot prepare test area"