test-lib: set $TRASH_DIRECTORY earlier
A later patch in this series will need to know the path to the trash directory early in 'test-lib.sh', but $TRASH_DIRECTORY is set much later. Set $TRASH_DIRECTORY earlier, where the other test-specific path variables are set. Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
SZEDER Gábor committed
Jan 5, 2019 at 02:08 UTC
61f292db4e1df5b4e871cefffff3e9ec01ef2ade
1 file changed
+6
-6
t/test-lib.sh
+6
-6
@@ -163,6 +163,12 @@ fi
163
TEST_NAME="$(basename "$0" .sh)"
164
TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/test-results"
165
TEST_RESULTS_BASE="$TEST_RESULTS_DIR/$TEST_NAME"
166
+TRASH_DIRECTORY="trash directory.$TEST_NAME"
167
+test -n "$root" && TRASH_DIRECTORY="$root/$TRASH_DIRECTORY"
168
+case "$TRASH_DIRECTORY" in
169
+/*) ;; # absolute path is good
170
+ *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;;
171
+esac
172
173
# if --tee was passed, write the output not only to the terminal, but
174
# additionally to the file test-results/$BASENAME.out, too.
@@ -1051,12 +1057,6 @@ then
1057
fi
1058
1059
# Test repository
1054
-TRASH_DIRECTORY="trash directory.$TEST_NAME"
1055
-test -n "$root" && TRASH_DIRECTORY="$root/$TRASH_DIRECTORY"
1056
-case "$TRASH_DIRECTORY" in
1057
-/*) ;; # absolute path is good
1058
- *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;;
1059
-esac
1060
rm -fr "$TRASH_DIRECTORY" || {
1061
GIT_EXIT_OK=t
1062
echo >&5 "FATAL: Cannot prepare test area"