From 002d4ce8aa40644698721d59691d38f1df702f4b Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sun, 14 Apr 2013 15:38:21 -0400 Subject: [PATCH] t/test-lib.sh: drop "$test" variable The $test variable is used as an interim buffer for constructing $TRASH_DIRECTORY, and is almost compatible with it (the exception being that $test has not been converted to an absolute path). Let's get rid of it entirely so that later code does not accidentally use it, thinking the two are interchangeable. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano --- t/test-lib.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/test-lib.sh b/t/test-lib.sh index c5121f4983..657b0bd862 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -592,11 +592,11 @@ then fi # Test repository -test="trash directory.$(basename "$0" .sh)" -test -n "$root" && test="$root/$test" -case "$test" in -/*) TRASH_DIRECTORY="$test" ;; - *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$test" ;; +TRASH_DIRECTORY="trash directory.$(basename "$0" .sh)" +test -n "$root" && TRASH_DIRECTORY="$root/$TRASH_DIRECTORY" +case "$TRASH_DIRECTORY" in +/*) ;; # absolute path is good + *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;; esac test ! -z "$debug" || remove_trash=$TRASH_DIRECTORY rm -fr "$TRASH_DIRECTORY" || { -- 2.11.4.GIT