diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2019-01-05 01:08:57 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-01-07 17:24:06 (GMT) |
| commit | 61f292db4e1df5b4e871cefffff3e9ec01ef2ade (patch) | |
| tree | f1a1d18a9a577cb0da1563b8d63b5e74a2c85fe1 /t/test-lib.sh | |
| parent | 62c379b8d4b56df94c79ca06e5aceff45f617901 (diff) | |
| download | git-61f292db4e1df5b4e871cefffff3e9ec01ef2ade.zip git-61f292db4e1df5b4e871cefffff3e9ec01ef2ade.tar.gz git-61f292db4e1df5b4e871cefffff3e9ec01ef2ade.tar.bz2 | |
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>
Diffstat (limited to 't/test-lib.sh')
| -rw-r--r-- | t/test-lib.sh | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index 5720292..0e9ac91 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -163,6 +163,12 @@ fi TEST_NAME="$(basename "$0" .sh)" TEST_RESULTS_DIR="$TEST_OUTPUT_DIRECTORY/test-results" TEST_RESULTS_BASE="$TEST_RESULTS_DIR/$TEST_NAME" +TRASH_DIRECTORY="trash directory.$TEST_NAME" +test -n "$root" && TRASH_DIRECTORY="$root/$TRASH_DIRECTORY" +case "$TRASH_DIRECTORY" in +/*) ;; # absolute path is good + *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;; +esac # if --tee was passed, write the output not only to the terminal, but # additionally to the file test-results/$BASENAME.out, too. @@ -1051,12 +1057,6 @@ then fi # Test repository -TRASH_DIRECTORY="trash directory.$TEST_NAME" -test -n "$root" && TRASH_DIRECTORY="$root/$TRASH_DIRECTORY" -case "$TRASH_DIRECTORY" in -/*) ;; # absolute path is good - *) TRASH_DIRECTORY="$TEST_OUTPUT_DIRECTORY/$TRASH_DIRECTORY" ;; -esac rm -fr "$TRASH_DIRECTORY" || { GIT_EXIT_OK=t echo >&5 "FATAL: Cannot prepare test area" |