diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-04-25 06:39:47 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-04-25 06:39:47 (GMT) |
| commit | 4d0912a206a32e9763424363617e8425f049f344 (patch) | |
| tree | 95d0682c16b961e6c87d5fbe5ef05f45c8945ff9 /t | |
| parent | df4c0d1a7927e17e7944ec24fa94468eee979f6e (diff) | |
| download | git-4d0912a206a32e9763424363617e8425f049f344.zip git-4d0912a206a32e9763424363617e8425f049f344.tar.gz git-4d0912a206a32e9763424363617e8425f049f344.tar.bz2 | |
test-lib.sh: do not barf under --debug at the end of the test
The original did "does $remove_trash exist? Then go one level above
and remove it". There was no problem under "--debug", where
the variable is left empty, as the first "test -d $remove_trash" would
have said "No, it doesn't".
With the check implemented in the previous step, we'd always get an
error under "--debug".
Noticed-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't')
| -rw-r--r-- | t/test-lib.sh | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/t/test-lib.sh b/t/test-lib.sh index cb0766b..d2f9ad5 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -760,13 +760,16 @@ test_done () { say "1..$test_count$skip_all" fi - test -d "$remove_trash" || - error "Tests passed but trash directory already removed before test cleanup; aborting" + if test -n "$remove_trash" + then + test -d "$remove_trash" || + error "Tests passed but trash directory already removed before test cleanup; aborting" - cd "$(dirname "$remove_trash")" && - rm -rf "$(basename "$remove_trash")" || - error "Tests passed but test cleanup failed; aborting" + cd "$(dirname "$remove_trash")" && + rm -rf "$(basename "$remove_trash")" || + error "Tests passed but test cleanup failed; aborting" + fi test_at_end_hook_ exit 0 ;; |